Olof Johansson 823c9faefc Merge branch 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc ... From Kukjin Kim: Just adding camif gpio setup and clkdev. * 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: S3C24XX: Add clkdev entry for camif-upll clock ARM: SAMSUNG: Add s3c24xx/s3c64xx CAMIF GPIO setup helpers + Linux 3.7-rc6 Conflicts due to the 3.7-rc6 sync: arch/arm/mach-highbank/system.c include/linux/clk-provider.h, resolved as in other branches. Signed-off-by: Olof Johansson <olof@lixom.net>		2012-11-30 09:27:57 -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	Merge branch 'samsung_platform_data' into staging/for_v3.7	2012-10-05 22:32:05 -03:00
atm	sections: fix section conflicts in drivers/atm	2012-10-06 03:04:40 +09:00
auxdisplay
base	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc	2012-11-10 21:58:34 +01:00
bcma	bcma: fix unregistration of cores	2012-10-15 14:45:51 -04:00
block	loop: Make explicit loop device destruction lazy	2012-10-30 08:37:31 +01:00
bluetooth	Bluetooth: ath3k: Add support for VAIO VPCEH [0489:e027]	2012-11-09 16:45:37 +01:00
bus	drivers: bus: ocp2scp: add pdata support	2012-11-07 09:35:53 -08:00
cdrom
char	sonypi: suspend/resume callbacks should be conditionally compiled on CONFIG_PM_SLEEP	2012-10-25 12:05:50 -07:00
clk	Merge branch 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc	2012-11-30 09:27:57 -08:00
clocksource	clocksource: sunxi: Add Allwinner A1X Timer Driver	2012-11-16 21:56:50 +01:00
connector
cpufreq	cpufreq / powernow-k8: Change maintainer's email address	2012-10-31 21:02:57 +01:00
cpuidle	cpuidle: add Calxeda SOC idle support	2012-11-07 17:15:36 -06:00
crypto	crypto: tegra: remove include of <mach/clk.h>	2012-11-05 11:36:05 -07:00
dca
devfreq
dio
dma	Merge remote-tracking branch 'arm-soc/imx/multiplatform' into x	2012-11-16 16:21:27 +01:00
edac	amd64_edac:__amd64_set_scrub_rate(): avoid overindexing scrubrates[]	2012-10-24 16:13:27 +02:00
eisa
extcon	extcon : register for cable interest by cable name	2012-10-23 16:32:18 +09:00
firewire	firewire: cdev: fix user memory corruption (i386 userland on amd64 kernel)	2012-10-09 18:26:28 +02:00
firmware	firmware/memmap: avoid type conflicts with the generic memmap_init()	2012-10-19 14:07:47 -07:00
gpio	Merge branch 'depends/gpio-devel' into next/soc	2012-11-23 08:26:29 -08:00
gpu	Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes	2012-11-16 10:00:43 +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	Merge branch 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc	2012-11-30 09:27:57 -08:00
ide	sections: fix section conflicts in drivers/ide	2012-10-06 03:04:41 +09:00
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-02 16:11:15 -07:00
iommu	ARM: tegra: move tegra-ahb.h out of arch/arm/mach-tegra/	2012-11-05 11:36:06 -07:00
irqchip	Merge branch 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc	2012-11-30 09:27:57 -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	Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-07 21:04:56 +09:00
macintosh	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2012-10-06 03:16:12 +09:00
md	MD RAID10: Fix oops when creating RAID10 arrays via dm-raid.c	2012-10-31 11:42:30 +11:00
media	mx2_camera: Fix regression caused by clock conversion	2012-11-16 16:21:49 +01:00
memory
memstick
message
mfd	mfd: Versatile Express system registers driver	2012-11-05 17:09:49 +00:00
misc	pwm: Changes for v3.7-rc1	2012-10-10 20:15:24 +09:00
mmc	Merge remote-tracking branch 'arm-soc/imx/multiplatform' into x	2012-11-16 16:21:27 +01:00
mtd	Merge branch 'clps711x/soc2' into next/soc	2012-11-21 09:58:28 -08:00
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem	2012-11-16 12:59:13 -05:00
nfc
nubus
of	of/platform: sparse fix	2012-10-17 15:53:03 -05:00
oprofile	mm: use mm->exe_file instead of first VM_EXECUTABLE vma->vm_file	2012-10-09 16:22:18 +09:00
parisc
parport	Xtensa patchset for 3.7	2012-10-09 16:11:46 +09:00
pci	PCI/portdrv: Don't create hotplug slots unless port supports hotplug	2012-11-05 16:59:59 -07:00
pcmcia	Merge branch 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into fixes	2012-10-19 15:40:18 -07:00
pinctrl	Merge branch 'next/soc-exynos5440' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc	2012-11-26 00:22:48 -08:00
platform	Merge branches 'fixes-for-37', 'ec' and 'thermal' into release	2012-10-09 01:47:35 -04:00
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	idr: rename MAX_LEVEL to MAX_IDR_LEVEL	2012-10-06 03:04:56 +09:00
ps3
ptp
pwm	pwm: Changes for v3.7-rc1	2012-10-10 20:15:24 +09:00
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	Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-07 21:04:56 +09:00
rpmsg	Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-07 21:04:56 +09:00
rtc	Merge remote-tracking branch 'arm-soc/imx/multiplatform' into x	2012-11-16 16:21:27 +01:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-16 14:10:15 -08:00
sbus
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc	2012-11-10 21:58:34 +01:00
sfi
sh	Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc	2012-11-12 21:45:19 +01:00
sn
spi	spi: Some minor MXS fixes	2012-10-28 11:13:54 -07:00
ssb
staging	Merge branch 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc	2012-11-30 09:27:57 -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	Merge branch 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc	2012-11-30 09:27:57 -08:00
uio	uio: uio_pruss: replace private SRAM API with genalloc	2012-10-27 16:28:32 +05:30
usb	Merge branch 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc	2012-11-30 09:27:57 -08:00
uwb
vfio	vfio: Fix PCI INTx disable consistency	2012-10-10 09:10:32 -06:00
vhost	vhost: fix mergeable bufs on BE hosts	2012-10-24 23:19:30 -04:00
video	Merge branch 'clps711x/soc2' into next/soc	2012-11-21 09:58:28 -08:00
virt
virtio	virtio: Don't access index after unregister.	2012-11-09 14:54:24 +10:30
vlynq
vme
w1
watchdog	watchdog: imx2_wdt: remove unneeded mach/hardware.h inclusion	2012-10-15 10:03:14 +08:00
xen	Bug-fixes:	2012-11-10 06:56:21 +01:00
zorro
Kconfig
Makefile	IPMI: Change link order	2012-10-16 18:07:12 -07:00