]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge branch 'block' of git://brick.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 30 Sep 2006 20:59:54 +0000 (13:59 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 30 Sep 2006 20:59:54 +0000 (13:59 -0700)
* 'block' of git://brick.kernel.dk/data/git/linux-2.6-block:
  [PATCH] Only enable CONFIG_BLOCK option for embedded


Trivial merge