diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 10:22:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 10:22:40 -0700 |
| commit | 90c8327cad5d7c2d5d7d3e761d17af1925474107 (patch) | |
| tree | b336806096868c1161d49abfc6e8bf0ada44b810 | |
| parent | a417fb99dea8ee47e72060fb36e5f3ff4ea54a5b (diff) | |
| parent | b4bcb4c28c64cc2876b4aef218d992ce806194da (diff) | |
| parent | fa10ba64ac94fec4611b79804023eb087862ffe0 (diff) | |
Merge branches 'x86-rwsem-for-linus' and 'x86-gcc46-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-rwsem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, rwsem: Minor cleanups
x86, rwsem: Stay on fast path when count > 0 in __up_write()
* 'x86-gcc46-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, gcc-4.6: Fix set but not read variables
x86, gcc-4.6: Avoid unused by set variables in rdmsr