| commit | a776878d6cf8a81fa65b29aa9bd6a10a5131e71c | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 9 Dec 2011 22:45:12 +0000 (9 14:45 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 9 Dec 2011 22:45:12 +0000 (9 14:45 -0800) | ||
| tree | a57cbd9605b86ff168f2bf3c2895461432a7e5c2 | treesnapshot (tar.gz zip) |
| parent | e2f4e0bc2aaf41a2b487ef7d2afb76e5c87d466c | commitdiff |
| parent | e8c7106280a305e1ff2a3a8a4dfce141469fb039 | commitdiff |
Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/tip
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, efi: Calling __pa() with an ioremap()ed address is invalid
x86, hpet: Immediately disable HPET timer 1 if rtc irq is masked
x86/intel_mid: Kconfig select fix
x86/intel_mid: Fix the Kconfig for MID selection
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, efi: Calling __pa() with an ioremap()ed address is invalid
x86, hpet: Immediately disable HPET timer 1 if rtc irq is masked
x86/intel_mid: Kconfig select fix
x86/intel_mid: Fix the Kconfig for MID selection