d90ce8711ceb516de823ae878270e5a21d11dede - kernel/msm

commit	d90ce8711ceb516de823ae878270e5a21d11dede	[log] [tgz]
author	Linus Torvalds <torvalds@linux-foundation.org>	Tue Jun 28 11:14:22 2011 -0700
committer	Linus Torvalds <torvalds@linux-foundation.org>	Tue Jun 28 11:14:22 2011 -0700
tree	28182cc7dbfe8b32dca9c127555e387ff2a4bdc1
parent	505cb6bc027ea8ae3782d2fdc47aa1915924ba80 [diff]
parent	a73738e9f85fa6ba3f1f9a6ea95b5e5fa99579a2 [diff]

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: comedi: fix build breakages on some platforms
  Staging: brcm80211: disable drivers except for X86 or MIPS platforms
  Staging: brcm80211: disable drivers for PPC platforms
  Staging: iio: Make IIO depend on GENERIC_HARDIRQS
  Staging: mei: fix suspend failure
  Staging: fix iio builds when IIO_RING_BUFFER is not enabled
  Staging: Comedi: Build only on arches providing PAGE_KERNEL_NOCACHE
  Staging: fix more iio builds when IIO_RING_BUFFER is not enabled

tree: 28182cc7dbfe8b32dca9c127555e387ff2a4bdc1