projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1508c99
0912e53
)
Merge branch 'for-rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Fri, 20 Nov 2009 17:51:21 +0000
(17:51 +0000)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Fri, 20 Nov 2009 17:51:21 +0000
(17:51 +0000)
Conflicts:
arch/arm/mach-at91/Kconfig
Trivial merge