projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bbc7610 2fc2c60)
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@woody.osdl.org>
Wed, 13 Dec 2006 17:15:34 +0000 (09:15 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Wed, 13 Dec 2006 17:15:34 +0000 (09:15 -0800)
commit5faad620264290b17e80a8b0996b039ea0d5ac73
tree3adf5ccbd2794f9fd3b81f75031e4621a67137b1tree | snapshot
parentbbc7610c062074468f362b37d33603536e87fb96commit | diff
parent2fc2c60df3d2b3a557eb8d750779def9d51934b1commit | 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.
drivers/block/cciss.c diff1 | diff2 | blob | history
John Crispins staging tree