projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6e9101a
4db70f7
)
Merge branch 'linus' into perf/urgent
author
Ingo Molnar
<mingo@elte.hu>
Thu, 26 May 2011 11:48:30 +0000
(13:48 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Thu, 26 May 2011 11:48:39 +0000
(13:48 +0200)
Merge reason: Linus applied an overlapping commit:
5f2e8e2b0bf0
: kernel/watchdog.c: Use proper ANSI C prototypes
So merge it in to make sure we can iterate the file without conflicts.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commitdiff