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
..
mmp	clk: mmp: add clock definition for mmp2	2012-08-28 14:15:42 -07:00
mxs	spi: Updates for v3.7	2012-10-02 17:26:42 -07:00
socfpga	ARM: socfpga: initial support for Altera's SOCFPGA platform	2012-07-19 10:39:00 +02:00
spear	Clk: SPEAr1340: Update sys clock parent array	2012-07-18 10:04:53 +05:30
ux500	clk: ux500: Register slimbus clock lookups for u8500	2012-11-12 10:20:23 -08:00
versatile	clk: convert ARM RealView to common clk	2012-08-24 17:42:10 -07:00
clk-bcm2835.c	ARM: bcm2835: Fix typo in the error message	2012-10-25 20:28:17 -06:00
clk-devres.c	ARM: 7537/1: clk: Fix release in devm_clk_put()	2012-09-19 21:51:27 +01:00
clk-divider.c	clk: Add CLK_IS_BASIC flag to identify basic clocks	2012-07-11 15:36:43 -07:00
clk-fixed-factor.c	clk: Add CLK_IS_BASIC flag to identify basic clocks	2012-07-11 15:36:43 -07:00
clk-fixed-rate.c	clk: add DT fixed-clock binding support	2012-07-11 17:58:46 -07:00
clk-gate.c	clk: Add CLK_IS_BASIC flag to identify basic clocks	2012-07-11 15:36:43 -07:00
clk-highbank.c	clk: add highbank clock support	2012-07-11 17:58:47 -07:00
clk-ls1x.c	clk: add Loongson1B clock support	2012-08-31 11:05:18 -07:00
clk-max77686.c	clock: max77686: Add driver for Maxim 77686 32Khz crystal oscillator.	2012-09-06 16:55:38 -07:00
clk-mux.c	clk: Add CLK_IS_BASIC flag to identify basic clocks	2012-07-11 15:36:43 -07:00
clk-nomadik.c	ARM: nomadik: convert to generic clock	2012-06-10 18:41:40 +02:00
clk-prima2.c	clk: prima2: move from arch/arm/mach to drivers/clk	2012-08-24 12:10:04 -07:00
clk-u300.c	ARM: u300: convert to common clock	2012-07-11 15:36:45 -07:00
clk-vt8500.c	arm: vt8500: clk: Add Common Clock Framework support	2012-09-21 19:23:57 +12:00
clk-wm831x.c	clk: wm831x: Add initial WM831x clock driver	2012-07-11 15:36:44 -07:00
clk.c	clk: add of_clk_src_onecell_get() support	2012-09-07 18:30:19 -07:00
clkdev.c	ARM: 7534/1: clk: Make the managed clk functions generically available	2012-09-15 21:55:27 +01:00
Kconfig	clock: max77686: Add driver for Maxim 77686 32Khz crystal oscillator.	2012-09-06 16:55:38 -07:00
Makefile	ARM: soc: device tree updates	2012-10-01 18:28:06 -07:00