lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/e1000e/netdev.c
	net/xfrm/xfrm_policy.c
This commit is contained in:
David S. Miller
2011-02-19 19:17:35 -08:00
parent 9435eb1cf0 2205a6ea93
commit da935c66ba
936 changed files with 10342 additions and 7433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/dcbnl.h
View File

@@ -106,8 +106,8 @@ struct ieee_pfc {
*/
struct dcb_app {
__u8 selector;
__u32 protocol;
__u8 priority;
__u16 protocol;
};
struct dcbmsg {