tree 029566def2c19f2f19c1510c719ca8898f224c2e
parent 56f29d7fe452890eeeb7f2b0138b2d95b9745fb6
parent 51d7513a8a54e4210d358ff1dbd34daab99a6638
author Linus Torvalds <torvalds@g5.osdl.org> 1159649994 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1159649994 -0700

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