Merge branch 'timers/rtc'
commitab236c87c63949f0c40c7aa95c2988cb427218d7
authorIngo Molnar <mingo@elte.hu>
Thu, 21 Jul 2011 07:21:19 +0000 (21 09:21 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 21 Jul 2011 07:21:19 +0000 (21 09:21 +0200)
tree7a7dec31950d8637b2df669c29bb53e435f2d12a
parent94a7fc7d49cfcdc073b8bcef6a6c9c6f0cd957f4
parentef68c8f87ed13f65df867dddf36c0e185b27b942
Merge branch 'timers/rtc'
arch/x86/platform/efi/efi.c