]> 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: ef1d7c0 4c4d41f)
Merge remote-tracking branch 'ipsec-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 02:44:33 +0000 (12:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 02:44:33 +0000 (12:44 +1000)
1  2 
include/uapi/linux/snmp.h patch | diff1 | diff2 | blob | history

diff --cc include/uapi/linux/snmp.h
Simple merge
Linux kernel for KaRo TX COM modules