]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4958178 7f6bd8e)
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)
commit217dbbf8845221b37691e466a26a15fc75c192bf
tree231672eb67197387f94bfda9a0995ddd002dbfbdtree | snapshot
parent4958178792e3daf8a5b6a1cb7e182ab86b47c61acommit | diff
parent7f6bd8e2540ef181cd06b493ea11d016603f69b0commit | diff
Merge branch 'master' of master.kernel.org:/pub/scm/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
Linux Kernel Source Tree.