tree 231672eb67197387f94bfda9a0995ddd002dbfbd
parent f3c58aceaa3f237ba43735805f4677950327b8ee
parent 6a6d01d374d03bd2f90030200cb78567444addc4
author David S. Miller <davem@davemloft.net> 1282541824 -0700
committer David S. Miller <davem@davemloft.net> 1282541824 -0700

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>