]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'apei' into release
authorLen Brown <len.brown@intel.com>
Wed, 18 Jan 2012 05:18:10 +0000 (00:18 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 18 Jan 2012 05:18:10 +0000 (00:18 -0500)

Trivial merge