projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4a215aa 8a745ee)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Oct 2012 05:54:24 +0000 (08:54 +0300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Oct 2012 05:54:24 +0000 (08:54 +0300)
commit4fe7e866a7d43479ac8d8a610023a9c9275f488f
tree8fa9c00514dc09cc34fd4bcfecba04ce46ad636ftree | snapshot
parent4a215aade0baa0487d4644d7aef6f166c84c516ecommit | diff
parent8a745ee13fbbbead62fd7d3a3c15a270b1901d63commit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven:
 "Just the expected UAPI disintegration and the "new" kcmp syscall."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Wire up kcmp
  m68k: Remove empty #ifdef/#else/#endif block
  UAPI: (Scripted) Disintegrate arch/m68k/include/asm
John Crispins staging tree