luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity
0f9cb211ba
tmp_suning_uos_patched/drivers
History
Olof Johansson 0f9cb211ba Linux 3.7-rc7 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iQEcBAABAgAGBQJQss0FAAoJEHm+PkMAQRiG6cEH/An3PYsWBBy27tzoLyVfJKF1
 3m3vR8HS2tnHg6erxms+738jos59vrWXV0Ygnvw0DHbGR0HNb4rkwce/KXu/jgOD
 MRYNYhlhMFJTEUFrSrcwKITrAV3kVPWXxPXgAR6Gzpr6NPKKM9TBzEv0ze56TFYz
 asOxqeBcPSS7aFZlkoNsy1wG4l0Quo5ke8VZIxo9Me5qlqubAoZ6pING4wAGXqeE
 tf81CevSdpe0nqr8/dlYyCvLjrurgpJQczxRCBI3mP6kLWGfUCVzZmcu86PfT9b+
 35zNJwDneIoN+D9bVDHy6mrq9uQdmhWnQuhv1joTPn6RDn1nyBRBd+A5qLxSov4=
 =CPoy
 -----END PGP SIGNATURE-----

Merge tag 'v3.7-rc7' into next/cleanup

Merging in mainline back to next/cleanup since it has collected a few
conflicts between fixes going upstream and some of the cleanup patches.
Git doesn't auto-resolve some of them, and they're mostly noise so let's
take care of it locally.

Conflicts are in:
	arch/arm/mach-omap2/omap_hwmod_44xx_data.c
	arch/arm/plat-omap/i2c.c
	drivers/video/omap2/dss/dss.c

Signed-off-by: Olof Johansson <olof@lixom.net>
2012-11-25 21:34:34 -08:00
..
accessibility
acpi ACPI video: Ignore errors after _DOD evaluation. 2012-11-03 09:52:54 +08:00
amba ARM: tegra: move tegra-ahb.h out of arch/arm/mach-tegra/ 2012-11-05 11:36:06 -07:00
ata SCSI fixes on 20121122 2012-11-22 09:14:54 -10:00
atm
auxdisplay
base PM / QoS: fix wrong error-checking condition 2012-11-23 20:55:06 +01:00
bcma bcma: fix unregistration of cores 2012-10-15 14:45:51 -04:00
block mtip32xx: Fix padding issue 2012-11-23 14:32:55 +01:00
bluetooth Linux 3.7-rc7 2012-11-25 21:34:34 -08:00
bus drivers: bus: ocp2scp: add pdata support 2012-11-07 09:35:53 -08:00
cdrom
char Merge branch 'omap/headers4' into next/cleanup 2012-11-15 17:06:24 +01:00
clk Linux 3.7-rc7 2012-11-25 21:34:34 -08:00
clocksource
connector
cpufreq cpufreq / powernow-k8: Change maintainer's email address 2012-10-31 21:02:57 +01:00
cpuidle
crypto ARM: tegra: cleanup for 3.8 2012-11-21 00:17:40 -08:00
dca
devfreq
dio
dma Merge branch 'omap/headers4' into next/cleanup 2012-11-15 17:06:24 +01:00
edac EDAC: Change Boris' email address 2012-10-30 10:05:51 +01:00
eisa
extcon extcon : register for cable interest by cable name 2012-10-23 16:32:18 +09:00
firewire [SCSI] sd: Implement support for WRITE SAME 2012-11-13 22:45:42 -08:00
firmware firmware/memmap: avoid type conflicts with the generic memmap_init() 2012-10-19 14:07:47 -07:00
gpio Linux 3.7-rc7 2012-11-25 21:34:34 -08:00
gpu Merge branch 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux into drm-fixes 2012-11-22 13:21:57 +10:00
hid Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid 2012-11-16 07:58:20 -08:00
hsi
hv Drivers: hv: Cleanup error handling in vmbus_open() 2012-10-24 15:46:27 -07:00
hwmon hwmon: Fix chip feature table headers 2012-11-05 21:54:40 +01:00
hwspinlock
i2c Linux 3.7-rc7 2012-11-25 21:34:34 -08:00
ide
idle
iio iio: Remove duplicates for light/ in Kconfig and Makefile 2012-10-19 19:44:06 +01:00
infiniband Merge branches 'cxgb4' and 'mlx4' into for-next 2012-10-23 09:03:49 -07:00
input Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2012-11-22 21:45:34 -10:00
iommu Linux 3.7-rc7 2012-11-25 21:34:34 -08:00
irqchip irqchip: irq-bcm2835: Add terminating entry for of_device_id table 2012-11-06 07:37:10 -08:00
isdn isdn: Make CONFIG_ISDN depend on CONFIG_NETDEVICES 2012-11-07 18:59:26 -05:00
leds ledtrig-cpu: kill useless mutex to fix sleep in atomic context 2012-11-11 12:09:43 -08:00
lguest
macintosh
md Several bug fixes for md in 3.7 2012-11-23 12:11:13 -10:00
media Merge branch 'omap/headers4' into next/cleanup 2012-11-15 17:06:24 +01:00
memory
memstick
message
mfd Merge branch 'omap-for-v3.8/cleanup-headers-menelaus' into omap-for-v3.8/cleanup-headers 2012-10-25 12:21:48 -07:00
misc
mmc Merge branch 'omap/headers4' into next/cleanup 2012-11-15 17:06:24 +01:00
mtd Linux 3.7-rc7 2012-11-25 21:34:34 -08:00
net bnx2x: remove redundant warning log 2012-11-23 14:17:36 -05:00
nfc NFC: Fix pn533 target mode memory leak 2012-11-20 00:09:26 +01:00
nubus
of of/platform: sparse fix 2012-10-17 15:53:03 -05:00
oprofile
parisc
parport
pci PCI/portdrv: Don't create hotplug slots unless port supports hotplug 2012-11-05 16:59:59 -07:00
pcmcia This is the first set of omap cleanup patches for v3.8 merge 2012-10-24 13:25:44 -07:00
pinctrl pinctrl/samsung: don't allow enabling pinctrl-samsung standalone 2012-11-15 11:58:24 +01:00
platform
pnp
power Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux 2012-10-13 11:27:59 +09:00
pps
ps3
ptp
pwm
rapidio rapidio: fix kernel-doc warnings 2012-11-16 14:33:04 -08:00
regulator Merge remote-tracking branches 'regulator/fix/gpio', 'regulator/fix/put' and 'regulator/fix/supp-volt' into tmp 2012-11-15 11:16:02 +09:00
remoteproc
rpmsg
rtc Merge branch 'arm-next' of git://git.xilinx.com/linux-xlnx into next/cleanup 2012-11-06 07:51:06 -08:00
s390 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-11-16 14:10:15 -08:00
sbus
scsi [SCSI] sd: Implement support for WRITE SAME 2012-11-13 22:45:42 -08:00
sfi
sh sh: Fix up more fallout from pointless ARM __iomem churn. 2012-10-15 14:08:48 +09:00
sn
spi spi: Some minor MXS fixes 2012-10-28 11:13:54 -07:00
ssb
staging Linux 3.7-rc7 2012-11-25 21:34:34 -08:00
target target: Fix incorrect usage of nested IRQ spinlocks in ABORT_TASK path 2012-11-01 00:38:45 -07:00
tc
thermal exynos4_tmu_driver_ids should be exynos_tmu_driver_ids. 2012-11-03 09:52:55 +08:00
tty Linux 3.7-rc7 2012-11-25 21:34:34 -08:00
uio
usb Linux 3.7-rc7 2012-11-25 21:34:34 -08:00
uwb
vfio
vhost vhost: fix mergeable bufs on BE hosts 2012-10-24 23:19:30 -04:00
video Linux 3.7-rc7 2012-11-25 21:34:34 -08:00
virt
virtio virtio: Don't access index after unregister. 2012-11-09 14:54:24 +10:30
vlynq
vme
w1
watchdog More PRCM cleanups via Paul Walmsley <paul@pwsan.com>: 2012-11-15 17:08:51 +01:00
xen Bug-fix: 2012-11-20 18:52:01 -10:00
zorro
Kconfig
Makefile IPMI: Change link order 2012-10-16 18:07:12 -07:00