leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7a6362800c
linux/arch/sh/include
History
Linus Torvalds 7a6362800c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1480 commits)
  bonding: enable netpoll without checking link status
  xfrm: Refcount destination entry on xfrm_lookup
  net: introduce rx_handler results and logic around that
  bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flag
  bonding: wrap slave state work
  net: get rid of multiple bond-related netdevice->priv_flags
  bonding: register slave pointer for rx_handler
  be2net: Bump up the version number
  be2net: Copyright notice change. Update to Emulex instead of ServerEngines
  e1000e: fix kconfig for crc32 dependency
  netfilter ebtables: fix xt_AUDIT to work with ebtables
  xen network backend driver
  bonding: Improve syslog message at device creation time
  bonding: Call netif_carrier_off after register_netdevice
  bonding: Incorrect TX queue offset
  net_sched: fix ip_tos2prio
  xfrm: fix __xfrm_route_forward()
  be2net: Fix UDP packet detected status in RX compl
  Phonet: fix aligned-mode pipe socket buffer header reserve
  netxen: support for GbE port settings
  ...

Fix up conflicts in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
with the staging updates.
2011-03-16 16:29:25 -07:00
..
asm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2011-03-16 16:29:25 -07:00
cpu-common/cpu sh: Kill off unused cpu/cacheflush.h. 2009-08-21 16:20:57 +09:00
cpu-sh2/cpu sh: Mass ctrl_in/outX to __raw_read/writeX conversion. 2010-01-26 12:58:40 +09:00
cpu-sh2a/cpu sh: Convert SH-2A to new cacheflush interface. 2009-08-15 12:38:29 +09:00
cpu-sh3/cpu sh: Fix up the SH-3 build. 2010-10-07 02:57:39 +09:00
cpu-sh4/cpu sh: Add div6_reparent_clks to clock framework for FSI 2010-11-29 12:59:22 +09:00
cpu-sh5/cpu sh: Convert cache disabled SH-5 over to new cache interface. 2009-08-16 00:53:56 +09:00
mach-common/mach sh, mmc: Make mmcif_update_progress static inline 2010-11-29 12:54:44 +09:00
mach-dreamcast/mach sh: mach-dreamcast: Convert to sparseirq. 2010-02-02 18:01:55 +09:00
mach-ecovec24/mach sh, mmc: Make mmcif_update_progress static inline 2010-11-29 12:54:44 +09:00
mach-kfr2r09/mach sh, mmc: Make mmcif_update_progress static inline 2010-11-29 12:54:44 +09:00
mach-landisk/mach sh: Move init_landisk_IRQ to header file 2011-01-11 12:47:33 +09:00
mach-migor/mach sh: audio support for the sh7722 Migo-R board 2010-03-02 11:08:54 +09:00
mach-sdk7786/mach sh: mach-sdk7786: Handle baseboard NMI source selection. 2010-12-17 18:58:04 +09:00
mach-se/mach sh: mach-se: Convert SE7343 FPGA to dynamic IRQ allocation. 2010-01-12 13:37:04 +09:00
mach-sh03/mach
mach-x3proto/mach sh: mach-x3proto: Support for baseboard GPIOs. 2010-10-04 02:59:29 +09:00