diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-21 07:36:55 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-21 07:36:55 -0800 |
commit | 4caca5f917ce991dc67fbb42fa82a1f044538e23 (patch) | |
tree | 29c9dadc3ab4aed954d8900f7171b44cd7a873bd /drivers/usb/storage/unusual_jumpshot.h | |
parent | f8c7e6c2038a96f427911264a0c1448c9e3c2a9e (diff) | |
parent | 7692fd4d441afac728cb83fdd33349d5ba07406c (diff) | |
download | blackbird-op-linux-4caca5f917ce991dc67fbb42fa82a1f044538e23.tar.gz blackbird-op-linux-4caca5f917ce991dc67fbb42fa82a1f044538e23.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
Staging: hv: fix smp problems in the hyperv core code
Staging: et131x: Fix 2.6.33rc1 regression in et131x
Staging: asus_oled: fix oops in 2.6.32.2
Diffstat (limited to 'drivers/usb/storage/unusual_jumpshot.h')
0 files changed, 0 insertions, 0 deletions