| Message ID | 20130710080241.GN5523@atomide.com |
|---|---|
| State | New |
| Headers | show |
On Wed, Jul 10, 2013 at 01:02:41AM -0700, Tony Lindgren wrote: > The following changes since commit ddcf6600b133697adbafd96e080818bdc0dfd028: > > Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging (2013-07-03 19:56:35 -0700) > > are available in the git repository at: > > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/fixes-for-merge-window Thanks, merged. There was a quite verbose merge conflict due to the changes of the Kconfig in our fixes branch, so please double-check my resolution. -Olof
The following changes since commit ddcf6600b133697adbafd96e080818bdc0dfd028: Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging (2013-07-03 19:56:35 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/fixes-for-merge-window for you to fetch changes up to c24a6ae18abde53b048372b066b93b71b1b91154: ARM: OMAP2+: omap2plus_defconfig: Enable appended DTB support (2013-07-04 05:11:57 -0700) ---------------------------------------------------------------- Omap fixes and minor defconfig updates that would be good to get in before -rc1. ---------------------------------------------------------------- Afzal Mohammed (1): ARM: OMAP2+: timer: initialize before using oh_name Eduardo Valentin (2): ARM: OMAP2+: omap2plus_defconfig: enable TI bandgap driver ARM: OMAP2+: omap2plus_defconfig: enable DRA752 thermal support by default Enric Balletbo i Serra (1): ARM: OMAP3: igep0020: Set DSS pins in correct mux mode. Joel Fernandes (1): ARM: OMAP2+: Enable TI_EDMA in omap2plus_defconfig Nishanth Menon (2): ARM: OMAP4: sleep: build OMAP4 specific functions only for OMAP4 ARM: scu: provide inline dummy functions when SCU is not present Paul Bolle (1): ARM: OMAP2+: Remove obsolete Makefile line Pavel Machek (1): ARM: OMAP2+: N900: enable N900-specific drivers even if device tree is enabled Santosh Shilimkar (1): ARM: OMAP5: Enable Cortex A15 errata 798181 Thomas Meyer (1): ARM: OMAP2+: Cocci spatch "ptr_ret.spatch" Tom Rini (1): ARM: OMAP2+: omap2plus_defconfig: Enable appended DTB support Wei Yongjun (1): ARM: OMAP2+: devices: remove duplicated include from devices.c arch/arm/configs/omap2plus_defconfig | 15 +++++++++++++++ arch/arm/include/asm/smp_scu.h | 13 ++++++++++++- arch/arm/mach-omap2/Kconfig | 1 + arch/arm/mach-omap2/Makefile | 4 ---- arch/arm/mach-omap2/board-igep0020.c | 31 +++++++++++++++++++++++++++++++ arch/arm/mach-omap2/board-rx51-video.c | 2 +- arch/arm/mach-omap2/devices.c | 5 ++--- arch/arm/mach-omap2/fb.c | 5 +---- arch/arm/mach-omap2/gpmc.c | 2 +- arch/arm/mach-omap2/pmu.c | 5 +---- arch/arm/mach-omap2/sleep44xx.S | 6 +++++- arch/arm/mach-omap2/timer.c | 2 +- sound/soc/omap/rx51.c | 2 +- 13 files changed, 72 insertions(+), 21 deletions(-)