]> git.baikalelectronics.ru Git - kernel.git/commitdiff
projects / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 01ecb24 f893136)
Merge branch 'linus' into perf/urgent
authorIngo Molnar <mingo@elte.hu>
Thu, 26 May 2011 11:48:30 +0000 (13:48 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 26 May 2011 11:48:39 +0000 (13:48 +0200)
Merge reason: Linus applied an overlapping commit:

  d6e8be93077f: 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
Linux Kernel Source Tree.