summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2011-03-16178-1725/+1407
|\
| * tty: serial: altera_jtaguart: Add device tree supportTobias Klauser2011-03-012-2/+17
| * tty: serial: altera_uart: Add devicetree supportTobias Klauser2011-03-012-4/+54
| * dt: eliminate of_platform_driver shim codeGrant Likely2011-03-012-79/+1
| * dt: Eliminate of_platform_{,un}register_driverGrant Likely2011-02-2827-148/+134
| * dt/serial: Eliminate users of of_platform_{,un}register_driverGrant Likely2011-02-289-46/+42
| * dt/usb: Eliminate users of of_platform_{,un}register_driverGrant Likely2011-02-288-41/+33
| * dt/video: Eliminate users of of_platform_{,un}register_driverGrant Likely2011-02-2813-64/+52
| * dt/net: Eliminate users of of_platform_{,un}register_driverGrant Likely2011-02-2826-128/+123
| * dt/sound: Eliminate users of of_platform_{,un}register_driverGrant Likely2011-02-288-49/+43
| * dt/spi: Eliminate users of of_platform_{,un}register_driverGrant Likely2011-02-288-36/+28
| * dt: uartlite: merge platform and of_platform driver bindingsGrant Likely2011-02-281-79/+24
| * dt: xilinx_hwicap: merge platform and of_platform driver bindingsGrant Likely2011-02-281-82/+47
| * ipmi: convert OF driver to platform driverRob Herring2011-02-281-47/+23
| * leds/leds-gpio: merge platform_driver with of_platform_driverGrant Likely2011-02-281-127/+87
| * dt/sparc: Eliminate users of of_platform_{,un}register_driverGrant Likely2011-02-2827-148/+133
| * dt/powerpc: Eliminate users of of_platform_{,un}register_driverGrant Likely2011-02-2826-161/+120
| * dt/powerpc: move of_bus_type infrastructure to ibmebusGrant Likely2011-02-284-437/+400
| * drivercore/dt: add a match table pointer to struct deviceGrant Likely2011-02-282-2/+4
| * dt: Typo fix.Lennert Buytenhek2011-02-281-1/+1
| * Merge commit 'v2.6.38-rc6' into devicetree/nextGrant Likely2011-02-28738-5880/+7892
| |\
| * | altera_ps2: Add devicetree supportWalter Goossens2011-02-152-2/+17
| * | powerpc/pci: Make both ppc32 and ppc64 use sysdata for pci_controllerGrant Likely2011-02-0410-42/+24
* | | Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bklLinus Torvalds2011-03-1655-619/+220
|\ \ \
| * | | BKL: That's all, folksArnd Bergmann2011-03-057-232/+2
| * | | fs/locks.c: Remove stale FIXME left over from BKL conversionMatt Fleming2011-03-051-1/+0
| * | | ipx: remove the BKLArnd Bergmann2011-03-052-33/+20
| * | | appletalk: remove the BKLArnd Bergmann2011-03-052-25/+16
| * | | x25: remove the BKLArnd Bergmann2011-03-053-43/+23
| * | | ufs: remove the BKLArnd Bergmann2011-03-027-108/+83
| * | | hpfs: remove the BKLArnd Bergmann2011-03-027-62/+75
| * | | drivers: remove extraneous includes of smp_lock.hArnd Bergmann2011-03-0221-22/+0
| * | | tracing: don't trace the BKLArnd Bergmann2011-03-022-68/+0
| * | | adfs: remove the big kernel lockArnd Bergmann2011-03-024-25/+1
| | |/ | |/|
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2011-03-161143-37918/+119131
|\ \ \
| * | | bonding: enable netpoll without checking link statusAndy Gospodarek2011-03-161-2/+0
| * | | xfrm: Refcount destination entry on xfrm_lookupSteffen Klassert2011-03-161-0/+2
| * | | net: introduce rx_handler results and logic around thatJiri Pirko2011-03-168-39/+98
| * | | bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flagJiri Pirko2011-03-163-10/+14
| * | | bonding: wrap slave state workJiri Pirko2011-03-164-25/+46
| * | | net: get rid of multiple bond-related netdevice->priv_flagsJiri Pirko2011-03-163-50/+15
| * | | bonding: register slave pointer for rx_handlerJiri Pirko2011-03-162-6/+14
| * | | be2net: Bump up the version numberAjit Khaparde2011-03-161-1/+1
| * | | be2net: Copyright notice change. Update to Emulex instead of ServerEnginesAjit Khaparde2011-03-166-30/+30
| * | | e1000e: fix kconfig for crc32 dependencyEric Dumazet2011-03-161-0/+1
| * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-03-161-9/+27
| |\ \ \
| | * | | netfilter ebtables: fix xt_AUDIT to work with ebtablesThomas Graf2011-03-161-9/+27
| * | | | xen network backend driverIan Campbell2011-03-159-54/+2908
| * | | | Merge branch 'stable/backends' of git://git.kernel.org/pub/scm/linux/kernel/g...David S. Miller2011-03-152-0/+44
| |\ \ \ \
| | * | | | xen/irq: implement bind_interdomain_evtchn_to_irqhandler for backend driversIan Campbell2011-02-282-0/+44