Takashi Iwai ddf83485d7 Merge branch 'for-linus' into for-next ...

Conflicts:
	sound/pci/hda/hda_codec.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>

2012-08-20 22:14:26 +02:00

..

acpi

…

asm-generic

…

crypto

…

drm

…

keys

…

linux

Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc

2012-08-02 11:52:39 -07:00

math-emu

…

media

…

memory

…

misc

…

mtd

…

net

Merge branch 'akpm' (Andrew's patch-bomb)

2012-07-31 19:25:39 -07:00

pcmcia

…

ras

…

rdma

…

rxrpc

…

scsi

…

sound

Merge branch 'for-linus' into for-next

2012-08-20 22:14:26 +02:00

target

…

trace

Merge branch 'akpm' (Andrew's patch-bomb)

2012-07-31 19:25:39 -07:00

video

…

xen

…

Kbuild

…