git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
21e7087
6847e15
4f6e1fe
)
Merge commit 'v2.6.31-rc3'; commit 'tip/oprofile' into oprofile/core
author
Robert Richter
<robert.richter@amd.com>
Tue, 14 Jul 2009 13:20:44 +0000
(15:20 +0200)
committer
Robert Richter
<robert.richter@amd.com>
Tue, 14 Jul 2009 13:20:44 +0000
(15:20 +0200)
Conflicts:
drivers/oprofile/oprofile_stats.c
drivers/usb/otg/Kconfig
drivers/usb/otg/Makefile
Signed-off-by: Robert Richter <robert.richter@amd.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff