]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
projects / mirror_ubuntu-disco-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e2f4e0b e8c7106)
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Dec 2011 22:45:12 +0000 (14:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Dec 2011 22:45:12 +0000 (14:45 -0800)
commita776878d6cf8a81fa65b29aa9bd6a10a5131e71c
treea57cbd9605b86ff168f2bf3c2895461432a7e5c2tree
parente2f4e0bc2aaf41a2b487ef7d2afb76e5c87d466ccommit | diff
parente8c7106280a305e1ff2a3a8a4dfce141469fb039commit | diff
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/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
Ubuntu Disco kernel mirror for Proxmox VE and PMG