git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f3c58ac
6a6d01d
)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
author
David S. Miller
<davem@davemloft.net>
Mon, 23 Aug 2010 05:37:04 +0000
(22:37 -0700)
committer
David S. Miller
<davem@davemloft.net>
Mon, 23 Aug 2010 05:37:04 +0000
(22:37 -0700)
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>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff