diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 07:53:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 07:53:04 -0700 |
| commit | ed2e5581d2702743460349e494f3ab8c4b0f28d8 (patch) | |
| tree | 58c4d331766807bf45c48c8a5123a90db04e87f1 /samples | |
| parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
| parent | 6fa977520871b1fc0be64247abad02b678c13fda (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
cciss: remove overlapping PCI IDs
block: cciss: fix information leak to userland
drivers/block/aoe/aoeblk.c: ratelimit a warning printk
drivers/block/z2ram.c: correct printing of sector_t
aoe: don't use flush_scheduled_work()
drivers/block/drbd/drbd_main.c: fix error path
loop: Properly clear sysfs in autoclear mode
Diffstat (limited to 'samples')
0 files changed, 0 insertions, 0 deletions