| commit | 5faad620264290b17e80a8b0996b039ea0d5ac73 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.osdl.org> | Wed Dec 13 09:15:34 2006 -0800 |
| committer | Linus Torvalds <torvalds@woody.osdl.org> | Wed Dec 13 09:15:34 2006 -0800 |
| tree | 3adf5ccbd2794f9fd3b81f75031e4621a67137b1 | |
| parent | bbc7610c062074468f362b37d33603536e87fb96 [diff] | |
| parent | 2fc2c60df3d2b3a557eb8d750779def9d51934b1 [diff] |
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block * 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block: [PATCH] Fixup cciss error handling [PATCH] Allow as-iosched to be unloaded [PATCH 2/2] cciss: remove calls to pci_disable_device [PATCH 1/2] cciss: map out more memory for config table [PATCH] Propagate down request sync flag Resolve trivial whitespace conflict in drivers/block/cciss.c manually.