summaryrefslogtreecommitdiffstats
path: root/block/blk-lib.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-24 23:42:03 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-24 23:42:03 +0100
commit47143b094d4700842e42b0a7cc2548d7ae292690 (patch)
treeab1e7fb7cdedd29c8a9b953e58110ff3870946e4 /block/blk-lib.c
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parentpci root complex: support for tile architecture (diff)
downloadlinux-47143b094d4700842e42b0a7cc2548d7ae292690.tar.xz
linux-47143b094d4700842e42b0a7cc2548d7ae292690.zip
Merge branch 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
* 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: pci root complex: support for tile architecture drivers/net/tile/: on-chip network drivers for the tile architecture MAINTAINERS: add drivers/char/hvc_tile.c as maintained by tile
Diffstat (limited to 'block/blk-lib.c')
0 files changed, 0 insertions, 0 deletions