Merge commit 'v3.0-rc7' into android-3.0
authorColin Cross <ccross@android.com>
Wed, 13 Jul 2011 03:10:37 +0000 (20:10 -0700)
committerColin Cross <ccross@android.com>
Wed, 13 Jul 2011 03:10:37 +0000 (20:10 -0700)
commit75c56a81116e51c5cf15c0641906d0745188cd16
treec1d8e7def5bbb099a39d5e9ccfb13508ea5ca46a
parentb4294d618e8a19bb47826e51ae52b9fb2fe05f80
parent620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc
Merge commit 'v3.0-rc7' into android-3.0
include/linux/sched.h
kernel/sched.c
net/ipv4/af_inet.c
net/ipv4/tcp.c
net/ipv6/af_inet6.c
sound/soc/soc-core.c