]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitd15abe570a8c4e10ca5436ea842d2a0b0a2656cb
treecd32d3053b30050182218e0d36b4aed7459c48detree | snapshot
parent01ecb24208fd2fcfb5a67f01bb36dc4978257f41commit | diff
parentf893136d2a6f5c193ff7d6da30e02c429bc4f7dacommit | diff
Merge branch 'linus' into perf/urgent

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