summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/hpet.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-28 13:37:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-28 13:37:31 -0700
commit1d16b0f2f3edf05f12a9e3960588e0d4854157bb (patch)
treebe1de144aa6d189c528384300cc91623122ecd52 /arch/x86/include/asm/hpet.h
parent032b734d291e3532221b6cf7643a5f41c6261941 (diff)
parent4b99fef02510706a73c8400045b4c72514e581c4 (diff)
downloadlinux-1d16b0f2f3edf05f12a9e3960588e0d4854157bb.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: regulator: fix enabling regulator issue on max8925
Diffstat (limited to 'arch/x86/include/asm/hpet.h')
0 files changed, 0 insertions, 0 deletions