1. 17 Mar, 2011 35 commits
  2. 16 Mar, 2011 5 commits
    • Russell King's avatar
      Merge branch 'p2v' into devel · 05e34754
      Russell King authored
      Conflicts:
      	arch/arm/kernel/module.c
      	arch/arm/mach-s5pv210/sleep.S
      05e34754
    • Russell King's avatar
      Merge branch 'v6v7' into devel · bd1274dc
      Russell King authored
      Conflicts:
      	arch/arm/include/asm/cacheflush.h
      	arch/arm/include/asm/proc-fns.h
      	arch/arm/mm/Kconfig
      bd1274dc
    • Russell King's avatar
      Merge branch 'misc' into devel · 1f0090a1
      Russell King authored
      Conflicts:
      	arch/arm/Kconfig
      1f0090a1
    • Russell King's avatar
      Merge branches 'at91', 'ep93xx', 'errata', 'footbridge', 'fncpy', 'gemini',... · 2472f3c8
      Russell King authored
      Merge branches 'at91', 'ep93xx', 'errata', 'footbridge', 'fncpy', 'gemini', 'irqdata', 'pm', 'sh', 'smp', 'spear', 'ux500' and 'via' into devel
      2472f3c8
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 · 7a636280
      Linus Torvalds authored
      * 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.
      7a636280