Len Brown 42de5532f4 Merge branch 'bugzilla-13931-sleep-nvs' into release ... Conflicts: drivers/acpi/sleep.c Signed-off-by: Len Brown <len.brown@intel.com>		2010-06-12 01:15:40 -04:00
..
acpi	Merge branch 'acpica-cherry-pick' into release	2010-06-12 00:56:15 -04:00
asm-generic	Merge branch 'for-35' of git://repo.or.cz/linux-kbuild	2010-06-01 08:55:52 -07:00
crypto
drm	drm/radeon/kms/evergreen: set accel_enabled	2010-06-08 09:34:42 +10:00
keys
linux	Merge branch 'bugzilla-13931-sleep-nvs' into release	2010-06-12 01:15:40 -04:00
math-emu
media	V4L/DVB: saa7134: add RM-K6 remote control support for Avermedia M135A	2010-06-01 01:22:09 -03:00
mtd
net	net: check for refcount if pop a stacked dst_entry	2010-06-04 15:56:00 -07:00
pcmcia
rdma
rxrpc
scsi	SCSI: implement sd_unlock_native_capacity()	2010-06-02 13:50:04 -04:00
sound
trace	Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-06-10 09:30:09 -07:00
video
xen
Kbuild