Tony Lindgren d702d12167 Merge with mainline to remove plat-omap/Kconfig conflict ...

Conflicts:
	arch/arm/plat-omap/Kconfig

2010-03-01 14:19:05 -08:00

..

accessibility

…

acpi

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

2010-02-26 10:35:27 -08:00

amba

…

ata

Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block

2010-03-01 09:00:29 -08:00

atm

…

auxdisplay

…

base

PM: Allow device drivers to use dpm_wait()

2010-02-26 20:39:11 +01:00

block

Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block

2010-03-01 09:00:29 -08:00

bluetooth

…

cdrom

…

char

Merge with mainline to remove plat-omap/Kconfig conflict

2010-03-01 14:19:05 -08:00

clocksource

Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-03-01 08:48:25 -08:00

connector

…

cpufreq

…

cpuidle

…

crypto

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2010-02-26 16:50:02 -08:00

dca

…

dio

…

dma

…

edac

…

eisa

…

firewire

…

firmware

drivers/firmware/iscsi_ibft.c: remove NIPQUAD_FMT, use %pI4

2010-02-26 21:02:14 +00:00

gpio

…

gpu

Merge branch 'x86-pci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-02-28 10:59:18 -08:00

hid

…

hwmon

…

i2c

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

2010-03-01 09:15:15 -08:00

ide

Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block

2010-03-01 09:00:29 -08:00

idle

…

ieee1394

…

ieee802154

…

infiniband

…

input

…

isdn

…

leds

…

lguest

…

macintosh

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

2010-02-27 16:22:47 -08:00

mca

…

md

…

media

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

2010-02-26 17:16:20 -08:00

memstick

…

message

Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block

2010-03-01 09:00:29 -08:00

mfd

Merge with mainline to remove plat-omap/Kconfig conflict

2010-03-01 14:19:05 -08:00

misc

…

mmc

Merge with mainline to remove plat-omap/Kconfig conflict

2010-03-01 14:19:05 -08:00

mtd

Merge with mainline to remove plat-omap/Kconfig conflict

2010-03-01 14:19:05 -08:00

net

Merge with mainline to remove plat-omap/Kconfig conflict

2010-03-01 14:19:05 -08:00

nubus

…

of

…

oprofile

…

parisc

…

parport

…

pci

pci: don't reassign to ROM res if it is not going to be enabled

2010-03-01 07:41:55 -08:00

pcmcia

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

2010-02-27 16:19:22 -08:00

platform

…

pnp

…

power

…

pps

…

ps3

…

rapidio

…

regulator

…

rtc

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

2010-03-01 09:15:15 -08:00

s390

Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block

2010-03-01 09:00:29 -08:00

sbus

…

scsi

Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block

2010-03-01 09:00:29 -08:00

serial

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

2010-03-01 09:15:15 -08:00

sfi

…

sh

…

sn

…

spi

Merge with mainline to remove plat-omap/Kconfig conflict

2010-03-01 14:19:05 -08:00

ssb

…

staging

Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block

2010-03-01 09:00:29 -08:00

tc

…

telephony

…

thermal

…

uio

…

usb

Merge with mainline to remove plat-omap/Kconfig conflict

2010-03-01 14:19:05 -08:00

uwb

…

video

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

2010-02-27 16:22:47 -08:00

virtio

…

vlynq

…

w1

…

watchdog

Merge with mainline to remove plat-omap/Kconfig conflict

2010-03-01 14:19:05 -08:00

xen

…

zorro

…

Kconfig

…

Makefile

…