git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a1c57e0
798778b
)
Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into...
author
Thomas Gleixner
<tglx@linutronix.de>
Sat, 14 May 2011 10:06:36 +0000
(12:06 +0200)
committer
Thomas Gleixner
<tglx@linutronix.de>
Sat, 14 May 2011 10:06:36 +0000
(12:06 +0200)
Conflicts:
arch/ia64/kernel/cyclone.c
arch/mips/kernel/i8253.c
arch/x86/kernel/i8253.c
Reason: Resolve conflicts so further cleanups do not conflict further
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff