summaryrefslogtreecommitdiff
path: root/block/blk.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-04-19 12:50:26 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-19 12:50:38 (GMT)
commit50ee9339c7347c2b16fa79d43777f72e9f41ef5a (patch)
treece09aa147e5c8bb74c72c46cebfdbffeece6678f /block/blk.h
parentf0e615c3cb72b42191b558c130409335812621d8 (diff)
parent98346f7db014614a4814eb60639f651f8bbc591d (diff)
downloadlinux-50ee9339c7347c2b16fa79d43777f72e9f41ef5a.tar.xz
Merge 2.6.39-rc4 into usb-next
This is needed to help resolve some xhci issues and other minor differences. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'block/blk.h')
0 files changed, 0 insertions, 0 deletions