Jens Axboe 04bf7869ca Merge branch 'for-linus' into for-3.1/core ...

Conflicts:
	block/blk-throttle.c
	block/cfq-iosched.c

Signed-off-by: Jens Axboe <[email protected]>

2011-07-01 16:17:13 +02:00

..

acpi

Merge branches 'acpica', 'aml-custom', 'bugzilla-16548', 'bugzilla-20242', 'd3-cold', 'ec-asus' and 'thermal-fix' into release

2011-05-29 04:38:48 -04:00

asm-generic

Merge branches 'gpio/merge' and 'spi/merge' of git://git.secretlab.ca/git/linux-2.6

2011-06-17 10:36:32 -07:00

crypto

…

drm

drm/radeon: workaround a hw bug on some radeon chipsets with all-0 EDIDs.

2011-06-16 16:30:54 +10:00

keys

…

linux

Merge branch 'for-linus' into for-3.1/core

2011-07-01 16:17:13 +02:00

math-emu

…

media

[media] v4l: Fix media_entity_to_video_device macro argument name

2011-06-01 09:42:03 -03:00

mtd

…

net

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2011-06-20 20:10:18 -07:00

pcmcia

…

rdma

…

rxrpc

…

scsi

…

sound

ASoC: Remove unused and about to be broken SND_SOC_CUSTOM I/O bus

2011-06-13 19:17:55 +01:00

target

…

trace

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

2011-06-21 10:22:35 -07:00

video

…

xen

…

Kbuild

…