summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-22 00:46:17 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-22 00:46:17 +0200
commit529a41e36673b518c9e091f3a8d932b6b9e3c461 (patch)
tree12416411590cb5d2b7f365f3800e31306909d6ce /arch/arm/Kconfig
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hsk... (diff)
parentrose: Socket lock was not released before returning to user space (diff)
downloadlinux-529a41e36673b518c9e091f3a8d932b6b9e3c461.tar.xz
linux-529a41e36673b518c9e091f3a8d932b6b9e3c461.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: rose: Socket lock was not released before returning to user space hci_usb: remove code obfuscation drivers/net/appletalk: use time_before, time_before_eq, etc drivers/atm: use time_before, time_before_eq, etc hci_usb: do not initialize static variables to 0 tg3: 5701 DMA corruption fix atm nicstar: Removal of debug code containing deprecated calls to cli()/sti() iwlwifi: Fix unconditional access to station->tidp[].agg. netfilter: Fix SIP conntrack build with NAT disabled. netfilter: Fix SCTP nat build.
Diffstat (limited to 'arch/arm/Kconfig')
0 files changed, 0 insertions, 0 deletions