projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cd7e1f0 eab2ec8)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Fri, 9 Oct 2009 21:40:09 +0000 (14:40 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 9 Oct 2009 21:40:09 +0000 (14:40 -0700)
1  2 
net/core/net-sysfs.c patch | diff1 | diff2 | blob | history
net/socket.c patch | diff1 | diff2 | blob | history

diff --cc net/core/net-sysfs.c
Simple merge
diff --cc net/socket.c
Simple merge