commit | 0cf0adb073908a66b6875ef8e016b235b9d43ee3 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 26 13:03:12 2011 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 26 13:03:12 2011 -0700 |
tree | 02e822713dee980aa310404bcfa97ed72dee6fc5 | |
parent | 96d185c76584b285dbaf39e4399a9a690ce7aa6d [diff] | |
parent | 1b965f1891eac2d8583b5248ef0bcbc91c201e27 [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: 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