]> git.kernelconcepts.de Git - mv-sheeva.git/commitdiff
Merge branch 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Nov 2010 22:42:03 +0000 (07:42 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Nov 2010 22:42:03 +0000 (07:42 +0900)
* '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

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge