]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
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)
commit47143b094d4700842e42b0a7cc2548d7ae292690
treeab1e7fb7cdedd29c8a9b953e58110ff3870946e4
parent0b9466ccea3c4ec363737288dd9467bf978c9c2d
parentf02cbbe657939489347cbda598401a56913ffcbd
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
MAINTAINERS