Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 6cdee2f96a - android_kernel_xiaomi_sm8450 - n4ne's gitea!

xiaomi-sm8450/android_kernel_xiaomi_sm8450

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

Pārlūkot izejas kodu

Conflicts:
	drivers/net/yellowfin.c

Šī revīzija ir iekļauta:

David S. Miller

2009-09-02 00:32:56 -07:00

vecāks 0625491493 2fbd3da387

revīzija 6cdee2f96a

50 mainīti faili ar 389 papildinājumiem un 227 dzēšanām

									
										1

drivers/net/bnx2.h
									
												Parādīt failu
												
				@@ -6903,6 +6903,7 @@ struct bnx2 {

					u32			idle_chk_status_idx;

				#ifdef BCM_CNIC

					struct mutex		cnic_lock;

					struct cnic_eth_dev	cnic_eth_dev;

				#endif