projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6e9101a 4db70f7)
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)
commit1102c660dd35725a11c7ca9365c237f2f42f6b30
treecd32d3053b30050182218e0d36b4aed7459c48detree | snapshot
parent6e9101aeec39961308176e0f59e73ac5d37d243acommit | diff
parent4db70f73e56961b9bcdfd0c36c62847a18b7dbb5commit | diff
Merge branch 'linus' into perf/urgent

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>
John Crispins staging tree