Merge branch 'block' of git://brick.kernel.dk/data/git/linux-2.6-block
commitcfae35804bcb909225d6f4eb5bd29e25971614d8
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 30 Sep 2006 20:59:54 +0000 (30 13:59 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 30 Sep 2006 20:59:54 +0000 (30 13:59 -0700)
tree029566def2c19f2f19c1510c719ca8898f224c2e
parent56f29d7fe452890eeeb7f2b0138b2d95b9745fb6
parent51d7513a8a54e4210d358ff1dbd34daab99a6638
Merge branch 'block' of git://brick.kernel.dk/data/git/linux-2.6-block

* 'block' of git://brick.kernel.dk/data/git/linux-2.6-block:
  [PATCH] Only enable CONFIG_BLOCK option for embedded