projects / kernel / kernel-generic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f3c58ac 6a6d01d)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 23 Aug 2010 05:37:04 +0000 (22:37 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 23 Aug 2010 05:37:04 +0000 (22:37 -0700)
commit2d4833aae65589ba4317dd325fe20c8b25c14173
tree231672eb67197387f94bfda9a0995ddd002dbfbdtree | snapshot
parentf3c58aceaa3f237ba43735805f4677950327b8eecommit | diff
parent6a6d01d374d03bd2f90030200cb78567444addc4commit | diff
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
include/linux/if_pppox.h

Fix conflict between Changli's __packed header file fixes and
the new PPTP driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/if_pppox.h diff1 | diff2 | blob | history
Domain: System / Uncategorized;