Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Oct 2010 21:16:08 +0000 (14:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Oct 2010 21:16:08 +0000 (14:16 -0700)
commitd56f84e7e317c69adefb2454a3d538a6d7e11e4b
tree18e9baeb22810139af93b77dbf03c8435f58070a
parent12462f2df4d10ea4f6d55b9d438ff788badec3f0
parent3414df8ca38b203c8a5ad8efc32d4a3836a0596d
Merge git://git./linux/kernel/git/gregkh/staging-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: dream: remove dream driver and arch from tree