Dave Airlie
a55205e229
Merge remote branch 'intel/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes ...
* 'intel/drm-intel-fixes' of /ssd/git/drm-next:
drm/i915: Only bind to function 0 of the PCI device
drm/i915: Suppress spurious vblank interrupts
drm: Avoid leak of adjusted mode along quick set_mode paths
drm: Simplify and defend later checks when disabling a crtc
drm: Don't switch fb when disabling an output
drm/i915: Reset crtc after resume
drm/i915/crt: Force the initial probe after reset
drm/i915: Reset state after a GPU reset or resume
drm: Add an interface to reset the device
drm/i915/sdvo: If at first we don't succeed in reading the response, wait
2011-02-02 11:22:34 +10:00
Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2011-01-20 16:28:34 -08:00
module: show version information for built-in modules in sysfs
2011-01-24 14:32:51 +10:30
crypto: padlock - Move padlock.h into include/crypto
2011-01-07 14:52:00 +11:00
Merge remote branch 'intel/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes
2011-02-02 11:22:34 +10:00
keys: add new key-type encrypted
2010-11-29 08:55:29 +11:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2011-01-26 16:31:44 +10:00
[media] v4l: Include linux/videodev2.h in media/v4l2-ctrls.h
2011-01-19 11:52:09 -02:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
2011-01-26 11:49:49 -08:00
RDMA: Update workqueue usage
2011-01-16 21:16:31 -08:00
Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block
2011-01-13 10:45:01 -08:00
ALSA: constify functions in ac97
2011-01-14 19:14:47 +01:00
[SCSI] target: Add LIO target core v4.0.0-rc6
2011-01-14 10:12:29 -06:00
Merge branches 'core-fixes-for-linus', 'x86-fixes-for-linus', 'timers-fixes-for-linus' and 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-01-15 12:45:00 -08:00
Merge branch 'fbdev/udlfb'
2011-01-06 18:10:09 +09:00
Merge branch 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2011-01-13 18:46:48 -08:00
a55205e229