OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a17fb8f
e534e87
)
Merge branch 'fixes-wakeupgen' into fixes
author
Tony Lindgren
<tony@atomide.com>
Wed, 5 Sep 2012 17:06:08 +0000
(10:06 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 5 Sep 2012 17:06:08 +0000
(10:06 -0700)
1
2
arch/arm/mach-omap2/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/mach-omap2/Kconfig
Simple merge