Joerg Roedel 801019d59d Merge branches 'amd/transparent-bridge' and 'core' ...

Conflicts:
	arch/x86/include/asm/amd_iommu_types.h
	arch/x86/kernel/amd_iommu.c

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>

2011-06-21 11:14:10 +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

libceph: Create a new key type "ceph".

2011-03-29 12:11:24 -07:00

linux

Merge branches 'amd/transparent-bridge' and 'core'

2011-06-21 11:14:10 +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

UBI: fix minor stylistic issues

2011-04-14 11:34:41 +03:00

net

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

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

pcmcia

pcmcia: Make declaration and uses of struct pcmcia_device_id const

2011-05-06 07:46:15 +02:00

rdma

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

2011-05-26 12:13:57 -07:00

rxrpc

Fix common misspellings

2011-03-31 11:26:23 -03:00

scsi

[SCSI] libsas: Add option for SATA soft reset

2011-05-26 22:49:33 -05:00

sound

Merge branch 'topic/asoc' into for-linus

2011-05-22 10:01:33 +02:00

target

[SCSI] target: Convert REPORT_LUNs to use int_to_scsilun

2011-05-24 13:02:42 -04:00

trace

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

2011-06-19 08:56:56 -07:00

video

Merge branches 'common/fbdev' and 'common/fbdev-meram' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

2011-05-24 15:49:57 +09:00

xen

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

2011-05-26 10:50:56 -07:00

Kbuild

…