UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/arch
History
David S. Miller ff4783ce78 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/sfc/rx.c

Overlapping changes in drivers/net/ethernet/sfc/rx.c, one to change
the rx_buf->is_page boolean into a set of u16 flags, and another to
adjust how ->ip_summed is initialized.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2012-02-26 21:55:51 -05:00
..
alpha net: Add framework to allow sending packets with customized CRC. 2012-02-24 01:37:35 -08:00
arm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-02-26 21:55:51 -05:00
avr32 net: Add framework to allow sending packets with customized CRC. 2012-02-24 01:37:35 -08:00
blackfin arch/blackfin: don't generate random mac in bfin_get_ether_addr() 2012-02-19 19:02:42 -05:00
c6x Kbuild: Use dtc's -d (dependency) option 2012-02-14 21:14:44 -05:00
cris net: Add framework to allow sending packets with customized CRC. 2012-02-24 01:37:35 -08:00
frv net: Add framework to allow sending packets with customized CRC. 2012-02-24 01:37:35 -08:00
h8300 net: Add framework to allow sending packets with customized CRC. 2012-02-24 01:37:35 -08:00
hexagon lib: move GENERIC_IOMAP to lib/Kconfig 2011-11-24 22:21:19 +02:00
ia64 arch/ia64/hp/sim/simeth.c: print MAC via printk format specifier 2012-02-24 15:41:15 -05:00
m32r net: Add framework to allow sending packets with customized CRC. 2012-02-24 01:37:35 -08:00
m68k Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-02-26 21:55:51 -05:00
microblaze Revert "microblaze: Add topology init" 2012-01-31 09:06:52 +01:00
mips net: Add framework to allow sending packets with customized CRC. 2012-02-24 01:37:35 -08:00
mn10300 net: Add framework to allow sending packets with customized CRC. 2012-02-24 01:37:35 -08:00
openrisc Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 2012-01-16 14:34:54 -08:00
parisc net: Add framework to allow sending packets with customized CRC. 2012-02-24 01:37:35 -08:00
powerpc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-02-26 21:55:51 -05:00
s390 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-02-26 21:55:51 -05:00
score score: fix off-by-one index into syscall table 2012-01-23 08:38:49 -08:00
sh SuperH fixes for 3.3-rc5 2012-02-24 08:56:51 -08:00
sparc net: Add framework to allow sending packets with customized CRC. 2012-02-24 01:37:35 -08:00
tile Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers 2012-01-14 18:03:30 -08:00
um UML net: set addr_assign_type if random_ether_addr() used 2012-02-17 16:05:03 -05:00
unicore32 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci 2012-01-11 18:50:26 -08:00
x86 i387: export 'fpu_owner_task' per-cpu variable 2012-02-20 19:34:10 -08:00
xtensa net: Add framework to allow sending packets with customized CRC. 2012-02-24 01:37:35 -08:00
.gitignore
…
Kconfig mm,x86,um: move CMPXCHG_DOUBLE config option 2012-01-12 20:13:03 -08:00