]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 488f2ea b2d84f0)
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>
Thu, 5 May 2005 12:59:37 +0000 (13:59 +0100)
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>
Thu, 5 May 2005 12:59:37 +0000 (13:59 +0100)
1  2 
kernel/audit.c patch | diff1 | diff2 | blob | history
net/netlink/af_netlink.c patch | diff1 | diff2 | blob | history

diff --cc kernel/audit.c
Simple merge
diff --cc net/netlink/af_netlink.c
Simple merge
Linux 2.6 source tree