aboutsummaryrefslogtreecommitdiff
path: root/drivers/block/viodasd.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-21 15:46:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-21 15:46:17 -0700
commit529a41e36673b518c9e091f3a8d932b6b9e3c461 (patch)
tree12416411590cb5d2b7f365f3800e31306909d6ce /drivers/block/viodasd.c
parentc3823c479e1f86a0adc7bb76fcfded67b042afc3 (diff)
parent43837b1e6c5aef803d57009a68db18df13e64892 (diff)
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 'drivers/block/viodasd.c')
0 files changed, 0 insertions, 0 deletions