]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 079eb62 417b23b)
Merge branch 'akpm-current/current'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 29 Oct 2012 03:16:05 +0000 (14:16 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 29 Oct 2012 03:16:05 +0000 (14:16 +1100)
Conflicts:
tools/testing/selftests/epoll/test_epoll.c


Trivial merge
Linux kernel for KaRo TX COM modules