From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Aug 2011 20:03:12 +0000 (-0700)
Subject: Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0cf0adb073908a66b6875ef8e016b235b9d43ee3;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

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

* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  staging: tidspbridge: fix compilation on dsp clock functions
  staging: octeon-ethernet: Add missing #includes.
  Staging: zcache: signedness bug in tmem_get()
  staging: zcache: fix crash on high memory swap
  staging: brcm80211: SPARC build error fix
  staging: brcm80211: fix compile error on non-x86 archs since 3.0 kernel
---

0cf0adb073908a66b6875ef8e016b235b9d43ee3