summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-13 14:18:42 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-13 14:18:42 +0200
commitc00193f9f09f9b852249a66391985f585d066084 (patch)
tree7ec2e0584fdddd89222a26f666903680b9b73892 /arch
parentc1a2f4b10852ce68e70f7e4c53600c36cc63ea45 (diff)
parentaccba5f3965d6a9d1bf7c1e1a7995d17e9d521b6 (diff)
parentf26ed116c0baa8f9cbbe3d5db84034d75f6250f8 (diff)
downloadlinux-3.10-c00193f9f09f9b852249a66391985f585d066084.tar.gz
linux-3.10-c00193f9f09f9b852249a66391985f585d066084.tar.bz2
linux-3.10-c00193f9f09f9b852249a66391985f585d066084.zip
Merge branches 'oprofile-v2' and 'timers/hpet' into x86/core-v4