)]}' { "log": [ { "commit": "f465d145d76803fe6332092775d891c8c509aa44", "tree": "45889e2eee7e8288ef269e9b661111364a71c25f", "parents": [ "30b842889eea1bea02dff55b13d2ddf07a46ce78", "80b9abf973462499c1a0110df47f62cc90361e2c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 13:14:01 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 13:14:01 2012 -0700" }, "message": "Merge tag \u0027cleanup-initcall\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull sweeping late_initcall cleanup for arm-soc from Olof Johansson:\n \"This is a patch series from Shawn Guo that moves from individual\n late_initcalls() to using a member in the machine structure to invoke\n a platform\u0027s late initcalls.\n\n This cleanup is a step in the move towards multiplatform kernels since\n it would reduce the need to check for compatible platforms in each and\n every initcall.\"\n\nFix up trivial conflicts in arch/arm/mach-{exynos/mach-universal_c210.c,\nimx/mach-cpuimx51.c, omap2/board-generic.c} due to changes nearby (and,\nin the case of cpuimx51.c the board support being deleted)\n\n* tag \u0027cleanup-initcall\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: ux500: use machine specific hook for late init\n ARM: tegra: use machine specific hook for late init\n ARM: shmobile: use machine specific hook for late init\n ARM: sa1100: use machine specific hook for late init\n ARM: s3c64xx: use machine specific hook for late init\n ARM: prima2: use machine specific hook for late init\n ARM: pnx4008: use machine specific hook for late init\n ARM: omap2: use machine specific hook for late init\n ARM: omap1: use machine specific hook for late init\n ARM: msm: use machine specific hook for late init\n ARM: imx: use machine specific hook for late init\n ARM: exynos: use machine specific hook for late init\n ARM: ep93xx: use machine specific hook for late init\n ARM: davinci: use machine specific hook for late init\n ARM: provide a late_initcall hook for platform initialization\n" }, { "commit": "243e095446c12082f961ef15709927ccb8ea0cc1", "tree": "a97261913499975cdcc26da189d775198d5e01ea", "parents": [ "eb9eef616b0ce14d554f75da197c0bfee8d2132f", "26e87b13834f04fc209e887f124e8ef4f3ca526c" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri May 11 22:31:02 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri May 11 22:31:02 2012 -0700" }, "message": "Merge branch \u0027msm-core\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/cleanup\n\n* \u0027msm-core\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:\n ARM: msm: fix compilation flags for MSM_SCM (part 2)\n arch/arm/mach-msm: linux/gpio.h included twice\n ARM: msm: Drop useless teq from DEBUG_LL support\n" }, { "commit": "26e87b13834f04fc209e887f124e8ef4f3ca526c", "tree": "eb430c5cf145a9290105e7aaca5ff2e7166fce8c", "parents": [ "847ac9bf61301f4ce61b4baa3883efdff91d6fea" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Mon Apr 30 19:17:20 2012 -0700" }, "committer": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Fri May 11 11:08:37 2012 -0700" }, "message": "ARM: msm: fix compilation flags for MSM_SCM (part 2)\n\neca55f4 (ARM: msm: fix compilation flags for MSM_SCM, 2011-11-08)\nadded the correct assembler directive for the first smc instance\nbut missed the second instance in scm_get_version(). Add it so we\ncan compile this file with newer binutils.\n\nCc: Marc Zyngier \u003cmarc.zyngier@arm.com\u003e\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nSigned-off-by: David Brown \u003cdavidb@codeaurora.org\u003e\n" }, { "commit": "847ac9bf61301f4ce61b4baa3883efdff91d6fea", "tree": "1968bf65e62c24422d4b828a32e776bb145565f8", "parents": [ "c97d9320c669d63b8c0bcd1c1b203af98d8aa34e" ], "author": { "name": "Danny Kukawka", "email": "danny.kukawka@bisect.de", "time": "Wed Feb 15 20:18:48 2012 +0100" }, "committer": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Fri May 11 11:08:36 2012 -0700" }, "message": "arch/arm/mach-msm: linux/gpio.h included twice\n\narch/arm/mach-msm/board-msm7x30.c and arch/arm/mach-msm/board-qsd8x50.c\nincluded \u0027linux/gpio.h\u0027 twice, remove the duplicates.\n\nSigned-off-by: Danny Kukawka \u003cdanny.kukawka@bisect.de\u003e\nSigned-off-by: David Brown \u003cdavidb@codeaurora.org\u003e\n" }, { "commit": "c97d9320c669d63b8c0bcd1c1b203af98d8aa34e", "tree": "9993a827266dac4305bdfdf8c5640e51e0fdd04a", "parents": [ "0034102808e0dbbf3a2394b82b1bb40b5778de9e" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Mon Dec 05 10:27:42 2011 -0800" }, "committer": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Fri May 11 11:08:34 2012 -0700" }, "message": "ARM: msm: Drop useless teq from DEBUG_LL support\n\nThis teq was first introduced in bcc0f6a ([ARM] msm: clean up\niomap and devices, 2008-09-10). It seems that DEBUG_LL support on\nMSM at the time had to remove the virtual mapping for the uart\nbase. Thus when the MMU was enabled the addruart macro returned 0\nand the senduart macro would test for 0 and do nothing. It was a\nsimple way to turn off DEBUG_LL when the MMU was enabled.\n\nThe virtual mapping was added back in 6339f66 (msm: make\ndebugging UART (for DEBUG_LL) configurable, 2009-11-02) but the\npatch forgot to remove the teq here. So as it stands the teq has\nbeen useless for two years and DEBUG_LL works fine without it.\n\nCc: Nicolas Pitre \u003cnico@fluxnic.net\u003e\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nSigned-off-by: David Brown \u003cdavidb@codeaurora.org\u003e\n" }, { "commit": "80b9abf973462499c1a0110df47f62cc90361e2c", "tree": "4e67448ba08df9a68713611b93e9f2635bf8bb26", "parents": [ "d48b97b403d23f6df0b990cee652bdf9a52337a3", "a010bc2b9e2ccc0b59057d4cc136d48a1f7cebcb" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri May 11 00:49:56 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri May 11 00:49:56 2012 -0700" }, "message": "Merge branch \u0027clean/late_initcall_v2\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6 into staging/cleanup\n\nBy Shawn Guo\nvia Shawn Guo\n* \u0027clean/late_initcall_v2\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6:\n ARM: ux500: use machine specific hook for late init\n ARM: tegra: use machine specific hook for late init\n ARM: shmobile: use machine specific hook for late init\n ARM: sa1100: use machine specific hook for late init\n ARM: s3c64xx: use machine specific hook for late init\n ARM: prima2: use machine specific hook for late init\n ARM: pnx4008: use machine specific hook for late init\n ARM: omap2: use machine specific hook for late init\n ARM: omap1: use machine specific hook for late init\n ARM: msm: use machine specific hook for late init\n ARM: imx: use machine specific hook for late init\n ARM: exynos: use machine specific hook for late init\n ARM: ep93xx: use machine specific hook for late init\n ARM: davinci: use machine specific hook for late init\n ARM: provide a late_initcall hook for platform initialization\n" }, { "commit": "c633c531f8afbcfd422409c3350b8dc55baa485e", "tree": "5c43940b04e2728f376404ace128fd7283dd5646", "parents": [ "8321b758e08cae7fb02663f26efee4ba985c2ae5" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Wed May 02 15:53:20 2012 +0800" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Tue May 08 20:36:17 2012 +0800" }, "message": "ARM: msm: use machine specific hook for late init\n\nCc: Daniel Walker \u003cdwalker@fifo99.com\u003e\nCc: Bryan Huntsman \u003cbryanh@codeaurora.org\u003e\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nAcked-by: David Brown \u003cdavidb@codeaurora.org\u003e\n" }, { "commit": "2b7b9a7d6c676691cd746a654e2c3b06a6feb9ba", "tree": "9c9a88747f9db48d8aefbf59615009d2f0fba290", "parents": [ "af33eadc73e4a5d35a966c1c7ffe28a8424c9d96" ], "author": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Mon Apr 23 15:34:20 2012 -0700" }, "committer": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Mon Apr 23 16:13:27 2012 -0700" }, "message": "ARM: msm: Fix gic irqdomain support\n\nAs of\n\n commit 75294957be1dee7d22dd7d90bd31334ba410e836\n Author: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n Date: Tue Feb 14 14:06:57 2012 -0700\n\n irq_domain: Remove \u0027new\u0027 irq_domain in favour of the ppc one\n\nthe ARM gic controller uses proper irq domains. Fix the MSM gic\ninitialization and DT so that it works again.\n\nSigned-off-by: David Brown \u003cdavidb@codeaurora.org\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "af33eadc73e4a5d35a966c1c7ffe28a8424c9d96", "tree": "c13052bba804bfec2febf66789fca50396d9517f", "parents": [ "e89c0e4377303a101d1032bf1dde822218372f15" ], "author": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Thu Apr 12 11:36:50 2012 -0700" }, "committer": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Fri Apr 13 10:23:17 2012 -0700" }, "message": "ARM: msm: Fix section mismatches in proc_comm.c\n\nThe change\n commit 4416e9eb0b4859b3d28016c5fd0a609bdcbc8a2a\n Author: Gregory Bean \u003cgbean@codeaurora.org\u003e\n Date: Wed Jul 28 10:22:12 2010 -0700\n\n arm: msm: Fix section mismatch in smd.c.\n\nfixes a section mismatch between the board file and the smd driver\u0027s\nprobe function, however, it misses the additional mismatches between\nthe probe function and some routines it calls. Fix these up as well.\n\nSigned-off-by: David Brown \u003cdavidb@codeaurora.org\u003e\n" }, { "commit": "204241c27c8fa2186e6d656d587f941422fff1b9", "tree": "c51d9739c137f246e5bf3a0db818a571f8cf94e9", "parents": [ "1c07ae43bb7f01480c0aceec36d1f27dd6c598bf" ], "author": { "name": "Daniel Walker", "email": "dwalker@fifo99.com", "time": "Thu Apr 12 08:45:37 2012 -0700" }, "committer": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Fri Apr 13 10:23:16 2012 -0700" }, "message": "arm: msm: trout: fix compile failure\n\nFixes the following warnings,\n\narch/arm/mach-msm/board-trout.c: In function \u0027trout_init\u0027:\narch/arm/mach-msm/board-trout.c:71: error: \u0027system_rev\u0027 undeclared (first use in this function)\narch/arm/mach-msm/board-trout.c:71: error: (Each undeclared identifier is reported only once\narch/arm/mach-msm/board-trout.c:71: error: for each function it appears in.)\n\nand\n\narch/arm/mach-msm/board-trout-panel.c: In function \u0027trout_init_panel\u0027:\narch/arm/mach-msm/board-trout-panel.c:267: error: \u0027system_rev\u0027 undeclared (first use in this function)\narch/arm/mach-msm/board-trout-panel.c:267: error: (Each undeclared identifier is reported only once\narch/arm/mach-msm/board-trout-panel.c:267: error: for each function it appears in.)\n\nThis came in with the following commit 9f97da78bf018206fb623cd351d454af2f105fe0\nwhich removes asm/system.h\n\nSigned-off-by: Daniel Walker \u003cdwalker@fifo99.com\u003e\ncc: David Howells \u003cdhowells@redhat.com\u003e\ncc: Bryan Huntsman \u003cbryanh@codeaurora.org\u003e\ncc: linux-arm-msm@vger.kernel.org\ncc: linux-arm-kernel@lists.infradead.org\nSigned-off-by: David Brown \u003cdavidb@codeaurora.org\u003e\n" }, { "commit": "1c07ae43bb7f01480c0aceec36d1f27dd6c598bf", "tree": "dde6909e77b4f5ae5b4624551979ae13bb264b61", "parents": [ "0034102808e0dbbf3a2394b82b1bb40b5778de9e" ], "author": { "name": "Daniel Walker", "email": "dwalker@fifo99.com", "time": "Wed Apr 11 21:04:02 2012 -0700" }, "committer": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Fri Apr 13 10:23:16 2012 -0700" }, "message": "arm: msm: halibut: remove unneeded fixup\n\nThis old fixup causes a build failure, so I remove it just like in\ntrout.\n\nSigned-off-by: Daniel Walker \u003cdwalker@fifo99.com\u003e\nSigned-off-by: David Brown \u003cdavidb@codeaurora.org\u003e\n" }, { "commit": "5d32c88f0b94061b3af2e3ade92422407282eb12", "tree": "2e1f81aa47b2cf59625c8fba17199617e33802e6", "parents": [ "43f63c8711ce02226b7bbdafeba7b8031faf3fb4", "dac23b0d0513916498d40412818bd2c581b365f7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 05 15:30:34 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 05 15:30:34 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge batch of fixes from Andrew Morton:\n \"The simple_open() cleanup was held back while I wanted for laggards to\n merge things.\n\n I still need to send a few checkpoint/restore patches. I\u0027ve been\n wobbly about merging them because I\u0027m wobbly about the overall\n prospects for success of the project. But after speaking with Pavel\n at the LSF conference, it sounds like they\u0027re further toward\n completion than I feared - apparently davem is at the \"has stopped\n complaining\" stage regarding the net changes. So I need to go back\n and re-review those patchs and their (lengthy) discussion.\"\n\n* emailed from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (16 patches)\n memcg swap: use mem_cgroup_uncharge_swap fix\n backlight: add driver for DA9052/53 PMIC v1\n C6X: use set_current_blocked() and block_sigmask()\n MAINTAINERS: add entry for sparse checker\n MAINTAINERS: fix REMOTEPROC F: typo\n alpha: use set_current_blocked() and block_sigmask()\n simple_open: automatically convert to simple_open()\n scripts/coccinelle/api/simple_open.cocci: semantic patch for simple_open()\n libfs: add simple_open()\n hugetlbfs: remove unregister_filesystem() when initializing module\n drivers/rtc/rtc-88pm860x.c: fix rtc irq enable callback\n fs/xattr.c:setxattr(): improve handling of allocation failures\n fs/xattr.c:listxattr(): fall back to vmalloc() if kmalloc() failed\n fs/xattr.c: suppress page allocation failure warnings from sys_listxattr()\n sysrq: use SEND_SIG_FORCED instead of force_sig()\n proc: fix mount -t proc -o AAA\n" }, { "commit": "234e340582901211f40d8c732afc49f0630ecf05", "tree": "753076500dfd883b3db56d4f5410af31d8945623", "parents": [ "9b3ae64be658a573b33d05a8dc73b08d3345fa44" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Thu Apr 05 14:25:11 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 05 15:25:50 2012 -0700" }, "message": "simple_open: automatically convert to simple_open()\n\nMany users of debugfs copy the implementation of default_open() when\nthey want to support a custom read/write function op. This leads to a\nproliferation of the default_open() implementation across the entire\ntree.\n\nNow that the common implementation has been consolidated into libfs we\ncan replace all the users of this function with simple_open().\n\nThis replacement was done with the following semantic patch:\n\n\u003csmpl\u003e\n@ open @\nidentifier open_f !\u003d simple_open;\nidentifier i, f;\n@@\n-int open_f(struct inode *i, struct file *f)\n-{\n(\n-if (i-\u003ei_private)\n-f-\u003eprivate_data \u003d i-\u003ei_private;\n|\n-f-\u003eprivate_data \u003d i-\u003ei_private;\n)\n-return 0;\n-}\n\n@ has_open depends on open @\nidentifier fops;\nidentifier open.open_f;\n@@\nstruct file_operations fops \u003d {\n...\n-.open \u003d open_f,\n+.open \u003d simple_open,\n...\n};\n\u003c/smpl\u003e\n\n[akpm@linux-foundation.org: checkpatch fixes]\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Julia Lawall \u003cJulia.Lawall@lip6.fr\u003e\nAcked-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b443caf12f9ee14e9843e53d4d929319e637275a", "tree": "5d1a5b58411d06122fea2f7659e739dff52b7ea3", "parents": [ "83e3fa6f0193299f8b7180db588edd5ca61a3b82" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Apr 01 16:38:38 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 14:41:16 2012 -0700" }, "message": "ARM: mach-msm: fix compile fail from system.h fallout\n\nTo fix:\n\n In file included from arm/boot/compressed/misc.c:28:0:\n arm/mach-msm/include/mach/uncompress.h: In function \u0027putc\u0027:\n arch/arm/mach-msm/include/mach/uncompress.h:48:3: error: implicit\n declaration of function \u0027smp_mb\u0027 [-Werror\u003dimplicit-function-declaration]\n\nThe putc does a cpu_relax which for this platform is smp_mb.\n\nBisect indicates the 1st failing commit as: 0195c00244dc (\"Merge tag\n\u0027split-asm_system_h...\")\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: David Brown \u003cdavidb@codeaurora.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "820d41cf0cd0e94a5661e093821e2e5c6b36a9d8", "tree": "4d03046048dc52a8fa539c7e7b846e02738d8ca5", "parents": [ "6268b325c3066234e7bddb99d2b98bcedb0c0033", "88b48684fe2d4f6207223423227c80d5408bccaf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 18:02:10 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 18:02:10 2012 -0700" }, "message": "Merge tag \u0027cleanup2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: cleanups of io includes\" from Olof Johansson:\n \"Rob Herring has done a sweeping change cleaning up all of the\n mach/io.h includes, moving some of the oft-repeated macros to a common\n location and removing a bunch of boiler plate. This is another step\n closer to a common zImage for multiple platforms.\"\n\nFix up various fairly trivial conflicts (\u003cmach/io.h\u003e removal vs changes\naround it, tegra localtimer.o is *still* gone, yadda-yadda).\n\n* tag \u0027cleanup2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)\n ARM: tegra: Include assembler.h in sleep.S to fix build break\n ARM: pxa: use common IOMEM definition\n ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol\n ARM: __io abuse cleanup\n ARM: create a common IOMEM definition\n ARM: iop13xx: fix missing declaration of iop13xx_init_early\n ARM: fix ioremap/iounmap for !CONFIG_MMU\n ARM: kill off __mem_pci\n ARM: remove bunch of now unused mach/io.h files\n ARM: make mach/io.h include optional\n ARM: clps711x: remove unneeded include of mach/io.h\n ARM: dove: add explicit include of dove.h to addr-map.c\n ARM: at91: add explicit include of hardware.h to uncompressor\n ARM: ep93xx: clean-up mach/io.h\n ARM: tegra: clean-up mach/io.h\n ARM: orion5x: clean-up mach/io.h\n ARM: davinci: remove unneeded mach/io.h include\n [media] davinci: remove includes of mach/io.h\n ARM: OMAP: Remove remaining includes for mach/io.h\n ARM: msm: clean-up mach/io.h\n ...\n" }, { "commit": "12679a2d7e3bfbdc7586e3e86d1ca90c46659363", "tree": "d9c00f2e599d1c3e04a349229a6a19906d01f99e", "parents": [ "1c036588772d01655d851f75dffc27c971e072e2", "b0df89868006517417251e02cc4ce5d4b0165885" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 16:53:48 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 16:53:48 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull more ARM updates from Russell King.\n\nThis got a fair number of conflicts with the \u003casm/system.h\u003e split, but\nalso with some other sparse-irq and header file include cleanups. They\nall looked pretty trivial, though.\n\n* \u0027for-linus\u0027 of git://git.linaro.org/people/rmk/linux-arm: (59 commits)\n ARM: fix Kconfig warning for HAVE_BPF_JIT\n ARM: 7361/1: provide XIP_VIRT_ADDR for no-MMU builds\n ARM: 7349/1: integrator: convert to sparse irqs\n ARM: 7259/3: net: JIT compiler for packet filters\n ARM: 7334/1: add jump label support\n ARM: 7333/2: jump label: detect %c support for ARM\n ARM: 7338/1: add support for early console output via semihosting\n ARM: use set_current_blocked() and block_sigmask()\n ARM: exec: remove redundant set_fs(USER_DS)\n ARM: 7332/1: extract out code patch function from kprobes\n ARM: 7331/1: extract out insn generation code from ftrace\n ARM: 7330/1: ftrace: use canonical Thumb-2 wide instruction format\n ARM: 7351/1: ftrace: remove useless memory checks\n ARM: 7316/1: kexec: EOI active and mask all interrupts in kexec crash path\n ARM: Versatile Express: add NO_IOPORT\n ARM: get rid of asm/irq.h in asm/prom.h\n ARM: 7319/1: Print debug info for SIGBUS in user faults\n ARM: 7318/1: gic: refactor irq_start assignment\n ARM: 7317/1: irq: avoid NULL check in for_each_irq_desc loop\n ARM: 7315/1: perf: add support for the Cortex-A7 PMU\n ...\n" }, { "commit": "0195c00244dc2e9f522475868fa278c473ba7339", "tree": "f97ca98ae64ede2c33ad3de05ed7bbfa4f4495ed", "parents": [ "f21ce8f8447c8be8847dadcfdbcc76b0d7365fa5", "141124c02059eee9dbc5c86ea797b1ca888e77f7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 15:58:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 15:58:21 2012 -0700" }, "message": "Merge tag \u0027split-asm_system_h-for-linus-20120328\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system\n\nPull \"Disintegrate and delete asm/system.h\" from David Howells:\n \"Here are a bunch of patches to disintegrate asm/system.h into a set of\n separate bits to relieve the problem of circular inclusion\n dependencies.\n\n I\u0027ve built all the working defconfigs from all the arches that I can\n and made sure that they don\u0027t break.\n\n The reason for these patches is that I recently encountered a circular\n dependency problem that came about when I produced some patches to\n optimise get_order() by rewriting it to use ilog2().\n\n This uses bitops - and on the SH arch asm/bitops.h drags in\n asm-generic/get_order.h by a circuituous route involving asm/system.h.\n\n The main difficulty seems to be asm/system.h. It holds a number of\n low level bits with no/few dependencies that are commonly used (eg.\n memory barriers) and a number of bits with more dependencies that\n aren\u0027t used in many places (eg. switch_to()).\n\n These patches break asm/system.h up into the following core pieces:\n\n (1) asm/barrier.h\n\n Move memory barriers here. This already done for MIPS and Alpha.\n\n (2) asm/switch_to.h\n\n Move switch_to() and related stuff here.\n\n (3) asm/exec.h\n\n Move arch_align_stack() here. Other process execution related bits\n could perhaps go here from asm/processor.h.\n\n (4) asm/cmpxchg.h\n\n Move xchg() and cmpxchg() here as they\u0027re full word atomic ops and\n frequently used by atomic_xchg() and atomic_cmpxchg().\n\n (5) asm/bug.h\n\n Move die() and related bits.\n\n (6) asm/auxvec.h\n\n Move AT_VECTOR_SIZE_ARCH here.\n\n Other arch headers are created as needed on a per-arch basis.\"\n\nFixed up some conflicts from other header file cleanups and moving code\naround that has happened in the meantime, so David\u0027s testing is somewhat\nweakened by that. We\u0027ll find out anything that got broken and fix it..\n\n* tag \u0027split-asm_system_h-for-linus-20120328\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system: (38 commits)\n Delete all instances of asm/system.h\n Remove all #inclusions of asm/system.h\n Add #includes needed to permit the removal of asm/system.h\n Move all declarations of free_initmem() to linux/mm.h\n Disintegrate asm/system.h for OpenRISC\n Split arch_align_stack() out from asm-generic/system.h\n Split the switch_to() wrapper out of asm-generic/system.h\n Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h\n Create asm-generic/barrier.h\n Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h\n Disintegrate asm/system.h for Xtensa\n Disintegrate asm/system.h for Unicore32 [based on ver #3, changed by gxt]\n Disintegrate asm/system.h for Tile\n Disintegrate asm/system.h for Sparc\n Disintegrate asm/system.h for SH\n Disintegrate asm/system.h for Score\n Disintegrate asm/system.h for S390\n Disintegrate asm/system.h for PowerPC\n Disintegrate asm/system.h for PA-RISC\n Disintegrate asm/system.h for MN10300\n ...\n" }, { "commit": "9f97da78bf018206fb623cd351d454af2f105fe0", "tree": "509971bf0d93f56d7ad182bdad3c89886f7ce675", "parents": [ "15d07dc9c59eae51219c40253bdf920f62bb10f2" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:01 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:01 2012 +0100" }, "message": "Disintegrate asm/system.h for ARM\n\nDisintegrate asm/system.h for ARM.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\ncc: Russell King \u003clinux@arm.linux.org.uk\u003e\ncc: linux-arm-kernel@lists.infradead.org\n" }, { "commit": "48d554418d3bfbba5e9dc1ebdf352f1b1f3ff4ee", "tree": "696bdc0c1087e82c6493c852bca514bb0fcd7881", "parents": [ "d61b7a572b292e2be409e13b4b3adf475f18fb29", "2cbe23e3a432e3d09a849adb197c8fcc09e7391d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:06:17 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:06:17 2012 -0700" }, "message": "Merge tag \u0027timer\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: timer cleanup work\" from Arnd Bergmann:\n \"These are split out from the generic soc and driver updates because\n there was a lot of conflicting work by multiple people. Marc Zyngier\n worked on simplifying the \"localtimer\" interfaces, and some of the\n platforms are touching the same code as they move to device tree based\n booting.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\"\n\n* tag \u0027timer\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (61 commits)\n ARM: tegra: select USB_ULPI if USB is selected\n arm/tegra: pcie: fix return value of function\n ARM: ux500: fix compilation after local timer rework\n ARM: shmobile: remove additional __io() macro use\n ARM: local timers: make the runtime registration interface mandatory\n ARM: local timers: convert MSM to runtime registration interface\n ARM: local timers: convert exynos to runtime registration interface\n ARM: smp_twd: remove old local timer interface\n ARM: imx6q: convert to twd_local_timer_register() interface\n ARM: highbank: convert to twd_local_timer_register() interface\n ARM: ux500: convert to twd_local_timer_register() interface\n ARM: shmobile: convert to twd_local_timer_register() interface\n ARM: tegra: convert to twd_local_timer_register() interface\n ARM: plat-versatile: convert to twd_local_timer_register() interface\n ARM: OMAP4: convert to twd_local_timer_register() interface\n ARM: smp_twd: add device tree support\n ARM: smp_twd: add runtime registration support\n ARM: local timers: introduce a new registration interface\n ARM: smp_twd: make local_timer_stop a symbol instead of a #define\n ARM: mach-shmobile: default to no earlytimer\n ...\n" }, { "commit": "56c10bf82c10588b743e75a13a7949e11b9fc942", "tree": "a2eda0459abb314107ac64af770bf7fb360aefc6", "parents": [ "bab2d8c6020e1d7521cb6c4939f72b061ce947bc", "61b80086a525c8a6081257ae40da5dee2bcaee16" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 17:30:49 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 17:30:49 2012 -0700" }, "message": "Merge branch \u0027for-armsoc\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull #1 ARM updates from Russell King:\n \"This one covers stuff which Arnd is waiting for me to push, as this is\n shared between both our trees and probably other trees elsewhere.\n\n Essentially, this contains:\n - AMBA primecell device initializer updates - mostly shrinking the\n size of the device declarations in platform code to something more\n reasonable.\n - Getting rid of the NO_IRQ crap from AMBA primecell stuff.\n - Nicolas\u0027 idle cleanups. This in combination with the restart\n cleanups from the last merge window results in a great many\n mach/system.h files being deleted.\"\n\nYay: ~80 files, ~2000 lines deleted.\n\n* \u0027for-armsoc\u0027 of git://git.linaro.org/people/rmk/linux-arm: (60 commits)\n ARM: remove disable_fiq and arch_ret_to_user macros\n ARM: make entry-macro.S depend on !MULTI_IRQ_HANDLER\n ARM: rpc: make default fiq handler run-time installed\n ARM: make arch_ret_to_user macro optional\n ARM: amba: samsung: use common amba device initializers\n ARM: amba: spear: use common amba device initializers\n ARM: amba: nomadik: use common amba device initializers\n ARM: amba: u300: use common amba device initializers\n ARM: amba: lpc32xx: use common amba device initializers\n ARM: amba: netx: use common amba device initializers\n ARM: amba: bcmring: use common amba device initializers\n ARM: amba: ep93xx: use common amba device initializers\n ARM: amba: omap2: use common amba device initializers\n ARM: amba: integrator: use common amba device initializers\n ARM: amba: realview: get rid of private platform amba_device initializer\n ARM: amba: versatile: get rid of private platform amba_device initializer\n ARM: amba: vexpress: get rid of private platform amba_device initializer\n ARM: amba: provide common initializers for static amba devices\n ARM: amba: make use of -1 IRQs warn\n ARM: amba: u300: get rid of NO_IRQ initializers\n ...\n" }, { "commit": "2cbe23e3a432e3d09a849adb197c8fcc09e7391d", "tree": "711fe5845c4c7e7eaf8c57a597d86c0f9dda5b06", "parents": [ "b2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc", "ed1b4acc43b0c3289faa30cf184f322ab70a5be3" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Mar 21 14:27:34 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Mar 21 14:27:34 2012 +0000" }, "message": "Merge branch \u0027tegra/cleanups\u0027 into next/timer\n\nConflicts:\n\tarch/arm/mach-tegra/Makefile\n\tarch/arm/mach-vexpress/core.h\n\nThe tegra Makefile was changed in four different branches\nin the same line. This merge should reduce the amount\nof churn.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "6f6f6a70295c6a4f89c7aca015c5db247a79d609", "tree": "e4927c35c999c3e999ac2c286f32cdeb54b81282", "parents": [ "6f71e9213c1dd31c44824e95ea4441883fceaf9c" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Sat Mar 10 10:30:31 2012 -0600" }, "committer": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Tue Mar 13 21:22:09 2012 -0500" }, "message": "ARM: create a common IOMEM definition\n\nSeveral platforms create IOMEM defines for casting to \u0027void __iomem *\u0027,\nand other platforms are incorrectly using __io() macro for the same\npurpose. This creates a common definition and removes all the platform\nspecific versions. Rather than try to make linux/io.h and asm/io.h\nassembly safe, the assembly version of IOMEM is moved into\nasm/assembler.h.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Sekhar Nori \u003cnsekhar@ti.com\u003e\nCc: Kevin Hilman \u003ckhilman@ti.com\u003e\nAcked-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nCc: Ryan Mallon \u003crmallon@gmail.com\u003e\nCc: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nCc: Haojian Zhuang \u003chaojian.zhuang@marvell.com\u003e\nAcked-by: David Brown \u003cdavidb@codeaurora.org\u003e\nCc: Daniel Walker \u003cdwalker@fifo99.com\u003e\nCc: Bryan Huntsman \u003cbryanh@codeaurora.org\u003e\nCc: Sascha Hauer \u003ckernel@pengutronix.de\u003e\nCc: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nAcked-by: Paul Walmsley \u003cpaul@pwsan.com\u003e\nAcked-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nCc: Rajeev Kumar \u003crajeev-dlh.kumar@st.com\u003e\nCc: Colin Cross \u003cccross@android.com\u003e\nCc: Olof Johansson \u003colof@lixom.net\u003e\nCc: Stephen Warren \u003cswarren@nvidia.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "5ca709c16d0fb88b86db35e958b165b61cbc1962", "tree": "14d0494b698fbc10d7b220130fe12d43f0f631e1", "parents": [ "a8cb6041d0ade808e0173f1e1ca1c92c67979806" ], "author": { "name": "Marc Zyngier", "email": "marc.zyngier@arm.com", "time": "Tue Jan 10 19:44:19 2012 +0000" }, "committer": { "name": "Marc Zyngier", "email": "marc.zyngier@arm.com", "time": "Tue Mar 13 13:45:55 2012 +0000" }, "message": "ARM: local timers: convert MSM to runtime registration interface\n\nConvert the MSM timers to the runtime registration interface.\n\nAcked-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nTested-by: David Brown \u003cdavidb@codeaurora.org\u003e\nAcked-by: David Brown \u003cdavidb@codeaurora.org\u003e\nSigned-off-by: Marc Zyngier \u003cmarc.zyngier@arm.com\u003e\n" }, { "commit": "4d5fc58dbe34b78157c05b319669bb3e064ba8bd", "tree": "e059d572e3591d9314e712daa19b8adad7671e43", "parents": [ "c334bc150524f833db3c76a0aaf55fb5044444e1" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Thu Feb 09 22:21:18 2012 -0600" }, "committer": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Tue Mar 06 21:34:44 2012 -0600" }, "message": "ARM: remove bunch of now unused mach/io.h files\n\nNow that many platforms don\u0027t need mach/io.h, remove the unused ones.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nAcked-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nAcked-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nAcked-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nAcked-by: Pawel Moll \u003cpawel.moll@arm.com\u003e\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\n" }, { "commit": "68a7f1f79f004e7a2a53352c82319d567ebb1da1", "tree": "c65e28b16bfec121e2a7b2311a3d8fc6027e175c", "parents": [ "17d971e5dceef87bb6fe179a942c8f6191afbab9" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Fri Feb 10 20:30:41 2012 -0600" }, "committer": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Tue Mar 06 21:34:38 2012 -0600" }, "message": "ARM: msm: clean-up mach/io.h\n\nMove msm specifics in mach/io.h to respective msm_iomap-*.h headers.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nCc: David Brown \u003cdavidb@codeaurora.org\u003e\nCc: Daniel Walker \u003cdwalker@fifo99.com\u003e\nCc: Bryan Huntsman \u003cbryanh@codeaurora.org\u003e\n" }, { "commit": "b12e9ba59c83f7df846602b201b64e4ddf28ccee", "tree": "69c5b7eaada4db4a683d87d30ad4a033ec9047d1", "parents": [ "c177aa98e5a7bbf71bc28baf0516896e3bb13f6e" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Mon Feb 13 13:27:24 2012 -0600" }, "committer": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Tue Mar 06 21:23:17 2012 -0600" }, "message": "ARM: msm: use runtime ioremap hook\n\nConvert msm platforms to use run-time ioremap hook instead of the compile\ntime hook.\n\nAccording to David Brown, only the msm7201 needed the ioremap hook.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nTested-by: David Brown \u003cdavidb@codeaurora.org\u003e\nAcked-by: David Brown \u003cdavidb@codeaurora.org\u003e\nCc: Daniel Walker \u003cdwalker@fifo99.com\u003e\nCc: Bryan Huntsman \u003cbryanh@codeaurora.org\u003e\n" }, { "commit": "f8e56c42e4e3527f629682ca123f881c1bea8500", "tree": "8a7dabb091612b50de7641d607dd0eca378d8f49", "parents": [ "6905a65879b51d326396e63dfea40861a30bc17f" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Wed Feb 22 01:39:37 2012 +0000" }, "committer": { "name": "Marc Zyngier", "email": "marc.zyngier@arm.com", "time": "Fri Feb 24 17:42:21 2012 +0000" }, "message": "msm: timer: Support sched_clock()\n\nNow that sched_clock is mandatory on ARM it\u0027s simple to add\nsched_clock support to the MSM timer code. Add it so that we get\nmore accurate sched_clock output than the jiffies based version\nthat\u0027s provided by default.\n\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nAcked-by: David Brown \u003cdavidb@codeaurora.org\u003e\nSigned-off-by: Marc Zyngier \u003cmarc.zyngier@arm.com\u003e\n" }, { "commit": "61b80086a525c8a6081257ae40da5dee2bcaee16", "tree": "675da35e4c03be3a5ca17bf6430e5b51dfed6296", "parents": [ "a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13", "230f984662d7e0e4a9597c665fd4f53130666e7d" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Feb 22 22:04:41 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Feb 22 22:04:41 2012 +0000" }, "message": "Merge branch \u0027entry-macro-cleanup\u0027 of git://sources.calxeda.com/kernel/linux into for-armsoc\n" }, { "commit": "230f984662d7e0e4a9597c665fd4f53130666e7d", "tree": "7882d2ab796b9266db2e06676afd8fef9c418abd", "parents": [ "243c86542aeeb41d9ab78d3aa44fa6b4854fdb67" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Sat Feb 04 09:41:36 2012 -0600" }, "committer": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Tue Feb 21 17:05:18 2012 -0600" }, "message": "ARM: remove disable_fiq and arch_ret_to_user macros\n\nNow that most platforms don\u0027t need disable_fiq and arch_ret_to_user\nmacros, we can remove the empty macros or empty entry-macro.S files.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nAcked-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Ryan Mallon \u003crmallon@gmail.com\u003e\nAcked-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nAcked-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nAcked-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\n" }, { "commit": "6b783f7c5dde2648fa0bbe7fc8ac80d78699e67f", "tree": "19a92338364d75d365b0587675d19250db5855ee", "parents": [ "75294957be1dee7d22dd7d90bd31334ba410e836" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Jan 10 17:09:30 2012 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Feb 16 06:11:23 2012 -0700" }, "message": "irq_domain: Remove irq_domain_add_simple()\n\nirq_domain_add_simple() was a stop-gap measure until complete irq_domain\nsupport was complete. This patch removes the irq_domain_add_simple()\ninterface.\n\nThis patch also drops the explicit irq_domain initialization performed\nby the mach-versatile code because the versatile interrupt controller\nalready has irq_domain support built into it. This was a bug that was\nhanging around quietly for a while, but with the full irq_domain which\nactually verifies that irq_domain ranges are available it would cause\nthe registration to fail and the system wouldn\u0027t boot.\n\nv4: Fixed number of irqs in mx5 gpio code\nv2: Updated to pass in host_data pointer on irq_domain allocation.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: Rob Herring \u003crob.herring@calxeda.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Milton Miller \u003cmiltonm@bga.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nTested-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13", "tree": "cce7eab28de00a88d75b8eda704f5838e10947b1", "parents": [ "dcf81c1af839b77b44404453ecae6e5ac5a75f05", "62aa2b537c6f5957afd98e29f96897419ed5ebab" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Feb 07 15:04:15 2012 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Feb 07 15:05:20 2012 -0800" }, "message": "Merge tag \u0027v3.3-rc2\u0027 into depends/rmk/for-armsoc\n\nThere were conflicts between fixes going in after 3.3-rc1 and\nRussell\u0027s stable arm-soc base branch. Resolving it in the dependency\nbranch so that each topic branch shares the same resolution.\n\nConflicts:\n\tarch/arm/mach-at91/at91cap9.c\n\tarch/arm/mach-at91/at91sam9g45.c\n" }, { "commit": "eb50439b92b6298bf209a982f295ba9c0f7cb30b", "tree": "8678f4221e4a40907d9781753a8b95c96bbfded6", "parents": [ "a092f2b15399bb4d1aa4e83cffe775f0c946f323" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Fri Jan 20 12:01:12 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jan 23 10:20:05 2012 +0000" }, "message": "ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP\n\nIt turns out that the logical CPU mapping is useful even when !CONFIG_SMP\nfor manipulation of devices like interrupt and power controllers when\nrunning a UP kernel on a CPU other than 0. This can happen when kexecing\na UP image from an SMP kernel.\n\nIn the future, multi-cluster systems running AMP configurations will\nrequire something similar for mapping cluster IDs, so it makes sense to\ndecouple this logic in preparation for this support.\n\nAcked-by: Yang Bai \u003chamo.by@gmail.com\u003e\nAcked-by: Marc Zyngier \u003cmarc.zyngier@arm.com\u003e\nReported-by: Joerg Roedel \u003cjoerg.roedel@amd.com\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "a570067df9cc1b1821ca5255bbbe8adb67aca199", "tree": "68303401d0e4eeca83373155af908a15ac402799", "parents": [ "ae940913030386884f259eb4d95ac4d93b57144f" ], "author": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Mon Dec 19 03:29:16 2011 -0500" }, "committer": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Fri Jan 20 19:25:58 2012 -0500" }, "message": "ARM: big removal of now unused arch_idle()\n\nWhen this is the only content remaining in mach/system.h then the\nwhole file is removed.\n\nSigned-off-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nAcked-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nAcked-and-tested-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nAcked-by: David Brown \u003cdavidb@codeaurora.org\u003e\nAcked-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "25eb433ab1aaa981cbb43b1d10c0d9377a50e8c9", "tree": "01b9f8dd9ff5605eb2c831f1e4aa81dcab751395", "parents": [ "4a3ea24405de36181b6ce074e110ee7efe110297" ], "author": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Wed Aug 03 11:34:59 2011 -0400" }, "committer": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Fri Jan 20 18:55:15 2012 -0500" }, "message": "ARM: mach-msm: hook special idle handlers to arm_pm_idle\n\nSigned-off-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nAcked-by: David Brown \u003cdavidb@codeaurora.org\u003e\n" }, { "commit": "8b0f6d12de91345190f234edba781b2fd03257b6", "tree": "4b6015433a0ffe5fc7ff9115014e3da580581f4b", "parents": [ "916e5ebb9f5a154bb845d555a1a84ef48411b73a", "efb963dcd9854c70667cdba9b5854b7290f1cefd" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Mon Jan 16 22:46:06 2012 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Mon Jan 16 22:46:06 2012 -0800" }, "message": "Merge branch \u0027fixes-for-arm-soc\u0027 of git://sources.calxeda.com/kernel/linux into fixes\n\n* \u0027fixes-for-arm-soc\u0027 of git://sources.calxeda.com/kernel/linux:\n ARM: make BSYM macro assembly only\n ARM: highbank: remove incorrect BSYM usage\n ARM: imx: remove incorrect BSYM usage\n ARM: exynos: remove incorrect BSYM usage\n ARM: ux500: add missing ENDPROC to headsmp.S\n ARM: msm: Add missing ENDPROC to headsmp.S\n ARM: versatile: Add missing ENDPROC to headsmp.S\n" }, { "commit": "916e5ebb9f5a154bb845d555a1a84ef48411b73a", "tree": "ac7aa579e926f013bd576c58e79d534f59d52767", "parents": [ "bbc390a6f275a7405a235b40b00ca0015a5cdb5b", "5e1a0f9f8d604c21fd72a09b632e3cd9ae66d3a6" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Mon Jan 16 22:45:56 2012 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Mon Jan 16 22:45:56 2012 -0800" }, "message": "Merge branch \u0027msm-fix\u0027 of git://codeaurora.org/quic/kernel/davidb/linux-msm into fixes\n\n* \u0027msm-fix\u0027 of git://codeaurora.org/quic/kernel/davidb/linux-msm:\n ARM: msm: vreg is a module and so needs module.h\n" }, { "commit": "8e0f549b23006e90172a4be188ba94f0944f08f8", "tree": "128510e88b9246a44df150540d9518fdc45371bd", "parents": [ "764a579fb56a9205a9212250e625efe2b11e3f96" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Thu Jan 12 08:46:23 2012 -0600" }, "committer": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Mon Jan 16 08:36:02 2012 -0600" }, "message": "ARM: msm: Add missing ENDPROC to headsmp.S\n\nOnce the ENDPROC is in place, BSYM() in not longer necessary\nto get correct pointer to msm_secondary_startup().\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nCc: David Brown \u003cdavidb@codeaurora.org\u003e\nCc: Daniel Walker \u003cdwalker@fifo99.com\u003e\n" }, { "commit": "e8cbce976050a9f874a8b07012ddeb9b9eb59603", "tree": "3660d00f49a70e20c74c3d41027ea8598ad926d7", "parents": [ "b3c37522928b5452588fc202eaa0f11f6e339256", "27fdb577435e336e4b00b9e51626f9002b88a86c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:40:48 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:40:48 2012 -0800" }, "message": "Merge tag \u0027timer\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\ntimer changes for msm\n\nA very simple series. We used to have more churn in the timer\narea, so this is kept separate. Will probably put this into the\ndrivers series next time.\n\n* tag \u0027timer\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n msm: timer: Use clockevents_config_and_register()\n msm: timer: Setup interrupt after registering clockevent\n msm: timer: Remove SoC specific #ifdefs\n msm: timer: Remove msm_clocks[] and simplify code\n msm: timer: Fix ONESHOT mode interrupts\n msm: timer: Use GPT for clockevents and DGT for clocksource\n msm: timer: Cleanup #includes and #defines\n msm: timer: Tighten #ifdef for local timer support\n" }, { "commit": "acc952c1f373bf3f66cc7a10680eee1762bed40b", "tree": "de1135ffe304f4d8e53d282e5bb1bde5db04e0ae", "parents": [ "57e964e1ae9bd4f699ae1074430bcf81a9a11377", "40ba95fdf158713377d47736b1b3a9d75f4f2515" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:21:03 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:21:03 2012 -0800" }, "message": "Merge tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nCleanups on various subarchitectures\n\nCleanup patches for various ARM platforms and some of their associated\ndrivers, the bulk of these is for mach-91.\n\nArnd ended up pulling in the restart branch from Russell in order to\nfix up some simple but annoying merge conflicts.\n\n* tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)\n arm/at91: fix build of stamp9g20\n ARM: u300: delete memory.h\n MAINTAINERS: add maintainer entry for Picochip picoxcell\n ARM: picoxcell: move io mappings to common.c\n ARM: picoxcell: don\u0027t reserve irq_descs\n ARM: picoxcell: remove mach/memory.h\n ARM: at91: delete the pcontrol_g20_defconfig\n arm/tegra: Remove code that\u0027s ifndef CONFIG_ARM_GIC\n arm/tegra: remove unused defines\n arm/tegra: fix variable formatting in makefile\n ARM: davinci: vpif: move code to driver core header from platform\n ARM: at91/gpio: fix display of number of irq setuped\n ARM: at91/gpio: drop PIN_BASE\n ARM: at91/udc: use gpio_is_valid to check the gpio\n ARM: at91/ohci: use gpio_is_valid to check the gpio\n ARM: at91/nand: use gpio_is_valid to check the gpio\n ARM: at91/mmc: use gpio_is_valid to check the gpio\n ARM: at91/ide: use gpio_is_valid to check the gpio\n ARM: at91/pata: use gpio_is_valid to check the gpio\n ARM: at91/soc: use gpio_is_valid to check the gpio\n ...\n" }, { "commit": "972b2c719990f91eb3b2310d44ef8a2d38955a14", "tree": "b25a250ec5bec4b7b6355d214642d8b57c5cab32", "parents": [ "02550d61f49266930e674286379d3601006b2893", "c3aa077648e147783a7a53b409578234647db853" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 12:19:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 12:19:57 2012 -0800" }, "message": "Merge branch \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\n* \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (165 commits)\n reiserfs: Properly display mount options in /proc/mounts\n vfs: prevent remount read-only if pending removes\n vfs: count unlinked inodes\n vfs: protect remounting superblock read-only\n vfs: keep list of mounts for each superblock\n vfs: switch -\u003eshow_options() to struct dentry *\n vfs: switch -\u003eshow_path() to struct dentry *\n vfs: switch -\u003eshow_devname() to struct dentry *\n vfs: switch -\u003eshow_stats to struct dentry *\n switch security_path_chmod() to struct path *\n vfs: prefer -\u003edentry-\u003ed_sb to -\u003emnt-\u003emnt_sb\n vfs: trim includes a bit\n switch mnt_namespace -\u003eroot to struct mount\n vfs: take /proc/*/mounts and friends to fs/proc_namespace.c\n vfs: opencode mntget() mnt_set_mountpoint()\n vfs: spread struct mount - remaining argument of next_mnt()\n vfs: move fsnotify junk to struct mount\n vfs: move mnt_devname\n vfs: move mnt_list to struct mount\n vfs: switch pnode.h macros to struct mount *\n ...\n" }, { "commit": "7affca3537d74365128e477b40c529d6f2fe86c8", "tree": "20be92bd240029182fc89c2c4f25401b7715dcae", "parents": [ "356b95424cfb456e14a59eaa579422ce014c424b", "ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:03:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:03:30 2012 -0800" }, "message": "Merge branch \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\n* \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (73 commits)\n arm: fix up some samsung merge sysdev conversion problems\n firmware: Fix an oops on reading fw_priv-\u003efw in sysfs loading file\n Drivers:hv: Fix a bug in vmbus_driver_unregister()\n driver core: remove __must_check from device_create_file\n debugfs: add missing #ifdef HAS_IOMEM\n arm: time.h: remove device.h #include\n driver-core: remove sysdev.h usage.\n clockevents: remove sysdev.h\n arm: convert sysdev_class to a regular subsystem\n arm: leds: convert sysdev_class to a regular subsystem\n kobject: remove kset_find_obj_hinted()\n m86k: gpio - convert sysdev_class to a regular subsystem\n mips: txx9_sram - convert sysdev_class to a regular subsystem\n mips: 7segled - convert sysdev_class to a regular subsystem\n sh: dma - convert sysdev_class to a regular subsystem\n sh: intc - convert sysdev_class to a regular subsystem\n power: suspend - convert sysdev_class to a regular subsystem\n power: qe_ic - convert sysdev_class to a regular subsystem\n power: cmm - convert sysdev_class to a regular subsystem\n s390: time - convert sysdev_class to a regular subsystem\n ...\n\nFix up conflicts with \u0027struct sysdev\u0027 removal from various platform\ndrivers that got changed:\n - arch/arm/mach-exynos/cpu.c\n - arch/arm/mach-exynos/irq-eint.c\n - arch/arm/mach-s3c64xx/common.c\n - arch/arm/mach-s3c64xx/cpu.c\n - arch/arm/mach-s5p64x0/cpu.c\n - arch/arm/mach-s5pv210/common.c\n - arch/arm/plat-samsung/include/plat/cpu.h\n - arch/powerpc/kernel/sysfs.c\nand fix up cpu_is_hotpluggable() as per Greg in include/linux/cpu.h\n" }, { "commit": "40ba95fdf158713377d47736b1b3a9d75f4f2515", "tree": "17a3216542d1107f777fd82577c91aebbce597d6", "parents": [ "70d84a6431d732cbc4e68e72b6890cdd3865d43d", "0575fb754dbfc32a01f297e778533340a533ec68" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 11:51:28 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 11:51:28 2012 +0000" }, "message": "Merge branch \u0027depends/rmk/restart\u0027 into next/cleanup\n\nConflicts:\n\tarch/arm/mach-at91/at91cap9.c\n\tarch/arm/mach-at91/at91sam9260.c\n\tarch/arm/mach-at91/at91sam9261.c\n\tarch/arm/mach-at91/at91sam9263.c\n\tarch/arm/mach-at91/at91sam9g45.c\n\tarch/arm/mach-at91/at91sam9rl.c\n\tarch/arm/mach-exynos/cpu.c\n\tarch/arm/mach-shmobile/board-kota2.c\n\nThis resolves a bunch of conflicts between the arm-soc tree\nand changes from the arm tree that have gone upstream.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df", "tree": "d851c923f85566572112d4c0f884cff388a3cc05", "parents": [ "805a6af8dba5dfdd35ec35dc52ec0122400b2610", "ea04018e6bc5ddb2f0466c0e5b986bd4901b7e8e" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Jan 06 11:42:52 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Jan 06 11:42:52 2012 -0800" }, "message": "Merge branch \u0027driver-core-next\u0027 into Linux 3.2\n\nThis resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,\nand it fixes the build error in the arch/x86/kernel/microcode_core.c\nfile, that the merge did not catch.\n\nThe microcode_core.c patch was provided by Stephen Rothwell\n\u003csfr@canb.auug.org.au\u003e who was invaluable in the merge issues involved\nwith the large sysdev removal process in the driver-core tree.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "5e1a0f9f8d604c21fd72a09b632e3cd9ae66d3a6", "tree": "1c1bc346d130faff68ac841235650465393d3d59", "parents": [ "eca55f4d9c1d918c2aa95fb8a73a34e2ba8a1b11" ], "author": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Thu Jan 05 15:55:46 2012 -0800" }, "committer": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Fri Jan 06 11:07:57 2012 -0800" }, "message": "ARM: msm: vreg is a module and so needs module.h\n\nThe MSM7201 vreg appears to have gotten missed in the module.h\ncleanup.\n\nSigned-off-by: David Brown \u003cdavidb@codeaurora.org\u003e\n" }, { "commit": "7b9dd47136c07ffd883aff6926c7b281e4c1eea4", "tree": "b835312e76fe323de3e1cbbb0d15fca5a3f7ef9c", "parents": [ "2e0e943436912ffe0848ece58167edfe754edb96", "0575fb754dbfc32a01f297e778533340a533ec68" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 05 13:25:15 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 05 13:25:27 2012 +0000" }, "message": "Merge branch \u0027restart\u0027 into for-linus\n\nConflicts:\n\tarch/arm/mach-exynos/cpu.c\n\nThe changes to arch/arm/mach-exynos/cpu.c were moved to\nmach-exynos/common.c.\n" }, { "commit": "2e0e943436912ffe0848ece58167edfe754edb96", "tree": "b91919095c74742fa06e2105db6d859bee39b2b4", "parents": [ "a32737e1ca650504f172292dd344eb64c02311f3", "ef3a0bf5bfadbace156fa2a3b9c753df2de41df2" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 05 13:24:33 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 05 13:24:33 2012 +0000" }, "message": "Merge branch \u0027devel-stable\u0027 into for-linus\n\nConflicts:\n\tarch/arm/kernel/setup.c\n\tarch/arm/mach-shmobile/board-kota2.c\n" }, { "commit": "f88b8979d26615ce68772cebc85c3b556571afca", "tree": "9af99a981ffc5b94faefcf05a4dba15a8554ca82", "parents": [ "5e3aa527c390377cdeea444f14ef5a28a0aab618" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Nov 05 21:30:00 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 05 12:57:22 2012 +0000" }, "message": "ARM: restart: remove the now empty arch_reset()\n\nRemove the now empty arch_reset() from all the mach/system.h includes,\nand remove its callsite. Remove arm_machine_restart() as this function\nno longer does anything useful.\n\nFor samsung platforms, remove the include of mach/system-reset.h and\nplat/system-reset.h from their respective mach/system.h headers as these\njust define their arch_reset functions. As a result, the s3c2410 and\nplat-samsung system-reset.h files are no longer referenced, so remove\nthese files entirely.\n\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nAcked-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nAcked-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "5e3aa527c390377cdeea444f14ef5a28a0aab618", "tree": "35071d55a06d3a6559f69d12e2d58f9c6c80218c", "parents": [ "e6849374f3fcec5a51ab6df40ae4d8034ba1c5e0" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Nov 05 12:36:40 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 05 12:57:22 2012 +0000" }, "message": "ARM: restart: remove comments about adding code to arch_reset()\n\narch_reset() is deprecated; systems should hook into system restart via\nthe \u0027restart\u0027 method in the platforms machine description record.\n\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nAcked-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "f4ae40a6a50a98ac23d4b285f739455e926a473e", "tree": "c84d7393700bd85e5285a194f8c22d4d00e36b28", "parents": [ "48176a973d65572e61d0ce95495e5072887e6fb6" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jul 24 04:33:43 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:54:56 2012 -0500" }, "message": "switch debugfs to umode_t\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "edbaa603eb801655e80808a9cf3d3b622e8ac66b", "tree": "a0a0091fc1d17fea32d6d21e3ce13d228fba6325", "parents": [ "7239f65cf364180cdb100a4ed211b2a9f9a72119" ], "author": { "name": "Kay Sievers", "email": "kay.sievers@vrfy.org", "time": "Wed Dec 21 16:26:03 2011 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Dec 21 16:26:03 2011 -0800" }, "message": "driver-core: remove sysdev.h usage.\n\nThe sysdev.h file should not be needed by any in-kernel code, so remove\nthe .h file from these random files that seem to still want to include\nit.\n\nThe sysdev code will be going away soon, so this include needs to be\nremoved no matter what.\n\nCc: Jiandong Zheng \u003cjdzheng@broadcom.com\u003e\nCc: Scott Branden \u003csbranden@broadcom.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nCc: David Brown \u003cdavidb@codeaurora.org\u003e\nCc: Daniel Walker \u003cdwalker@fifo99.com\u003e\nCc: Bryan Huntsman \u003cbryanh@codeaurora.org\u003e\nCc: Ben Dooks \u003cben-linux@fluff.org\u003e\nCc: Wan ZongShun \u003cmcuos.com@gmail.com\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@gmail.com\u003e\nCc: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\nCc: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\nCc: \"Venkatesh Pallipadi\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: Richard Purdie \u003crpurdie@rpsys.net\u003e\nCc: Matthew Garrett \u003cmjg@redhat.com\u003e\nSigned-off-by: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\n" }, { "commit": "844e8a16f25568eefd02a6bfb40bdd9bc04704b8", "tree": "fdfe4de420c66517a2e4a2a25a454997c6210e95", "parents": [ "5ecdd39f6cdd57aa42e072bf30aa7239fd109d7a", "a53bfa07369b7c3448a60d29f0fc2e81751ed0b7" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Mon Dec 19 21:12:24 2011 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Mon Dec 19 21:13:41 2011 -0800" }, "message": "Merge branch \u0027picoxcell/cleanup\u0027 into next/cleanup\n\n* picoxcell/cleanup: (4 commits)\n MAINTAINERS: add maintainer entry for Picochip picoxcell\n ARM: picoxcell: move io mappings to common.c\n ARM: picoxcell: don\u0027t reserve irq_descs\n ARM: picoxcell: remove mach/memory.h\n\nConflicts:\n\tarch/arm/mach-at91/setup.c\n" }, { "commit": "df0bcfe0f811a73077c06f75e440397e89ba58a4", "tree": "0d59d32430f337acda23a18b2e0116a2b9dcd51f", "parents": [ "215e83d971a04f04d191c7f702943412a19408fd", "a2075a7aff5f469b91029c14f216dc169d1bd5f3" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Dec 19 21:54:35 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Dec 19 21:54:35 2011 +0000" }, "message": "Merge branch \u0027arm/common-kconfig-refactor+for-rmk\u0027 of git://git.linaro.org/people/dmart/linux-2.6-arm into devel-stable\n" }, { "commit": "3b55658aefbf82646a246f3c8a14b9b8a24198a9", "tree": "9d878552336a55c8eff7745e43cc6e5108cf6dce", "parents": [ "ce5ea9f3767e8589521319cae2eb6e05c52bd056" ], "author": { "name": "Dave Martin", "email": "dave.martin@linaro.org", "time": "Wed Dec 07 15:38:04 2011 +0000" }, "committer": { "name": "Dave Martin", "email": "dave.martin@linaro.org", "time": "Mon Dec 19 13:47:39 2011 +0000" }, "message": "ARM: SMP: Refactor Kconfig to be more maintainable\n\nMaking SMP depend on (huge list of MACH_ and ARCH_ configs) is\nbothersome to maintain and likely to lead to merge conflicts.\n\nThis patch moves the knowledge of which platforms are SMP-capable\nto the individual machines. To enable this, a new HAVE_SMP config\noption is introduced to allow machines to indicate that they can\nrun in a SMP configuration.\n\nSigned-off-by: Dave Martin \u003cdave.martin@linaro.org\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n (for nomadik, ux500)\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\n (for omap)\nAcked-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n (for exynos)\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n (for imx)\nAcked-by: Olof Johansson \u003colof@lixom.net\u003e\n (for tegra)\n" }, { "commit": "02735a29d8ce882ec698803f064e17888874780c", "tree": "6a4afa3bc8b6d4334df24910a56f77adf126b0c7", "parents": [ "8d685b7f4d9c9882442bf1b492558d5f17b694fa", "3d911ad22e8405c1a333a6812e405cb1a5ae9829" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Dec 15 22:02:34 2011 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Dec 15 22:02:34 2011 -0800" }, "message": "Merge branch \u0027at91/defconfig\u0027 into next/cleanup\n" }, { "commit": "592d44a5f8458892c007c61b9cfa677efede5e1e", "tree": "cec376faf5dd25e1ce89134b0503d8354e473392", "parents": [ "3ab345fc4b95a981a83f616487bbe07ddb5b1b1a", "b2c1639135c0fc1560f3fe9a3a83f2c8265a9e02" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 09 08:08:14 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 09 08:08:14 2011 -0800" }, "message": "Merge branch \u0027iommu/fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu\n\n* \u0027iommu/fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:\n MAINTAINERS: Update amd-iommu F: patterns\n iommu/amd: Fix typo in kernel-parameters.txt\n iommu/msm: Fix compile error in mach-msm/devices-iommu.c\n Fix comparison using wrong pointer variable in dma debug code\n" }, { "commit": "96f176a310e447966e45112fe4511b9d9fa0caf4", "tree": "c156b9997cec5fb401356fab212e4aca0e8d1c96", "parents": [ "91ec37cc1015220965e39bf342fb846810d19e79" ], "author": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Tue Dec 06 11:17:34 2011 +0100" }, "committer": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Tue Dec 06 11:17:34 2011 +0100" }, "message": "iommu/msm: Fix compile error in mach-msm/devices-iommu.c\n\nFix compile error due to missing \u003clinux/module.h\u003e include.\n\nSigned-off-by: Joerg Roedel \u003cjoerg.roedel@amd.com\u003e\n" }, { "commit": "73829af71fdb8655e7ba4b5a2a6612ad34a75a11", "tree": "4277605ab142a4f02ff4efad9a7fe522054b7a7f", "parents": [ "742eaa6a6e356a16788ce6530271de89bc4f8fb5", "0af362f8440a78b970d5f215e234420fa87d0f3f" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Dec 05 23:27:54 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Dec 05 23:27:59 2011 +0000" }, "message": "Merge branch \u0027vmalloc\u0027 of git://git.linaro.org/people/nico/linux into devel-stable\n" }, { "commit": "8d685b7f4d9c9882442bf1b492558d5f17b694fa", "tree": "fcd2cfc985cad3982b5334f3b57054c7279770bc", "parents": [ "1e81799bd62d42bb6d5ec5c74e9b022e7d44f11c", "2b222a2971e4d73fc25c09aeb203c16c0c3c142e" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Dec 01 12:34:21 2011 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Dec 01 12:34:21 2011 +0000" }, "message": "Merge branches \u0027at91/gpio\u0027, \u0027at91/ioremap\u0027, \u0027drivers/macb-gem-cleanup\u0027 and \u0027msm/misc\u0027 into next/cleanup\n" }, { "commit": "d0e6b2236a26711939bfcdd97370fedcd526a191", "tree": "63cceb3ab98b24831bb091dfa5cbe6ce91be420d", "parents": [ "576d2f2525612ecb5af029a76f21f22a3b82563d" ], "author": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Thu Sep 15 16:30:54 2011 -0400" }, "committer": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Sat Nov 26 19:21:29 2011 -0500" }, "message": "ARM: big removal of now unused vmalloc.h files\n\nSigned-off-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\n" }, { "commit": "08d33b27f7063ba2b4a29f9e3a2dcb65f30dec0b", "tree": "e338de68f8b56238b91d9979857be253310f0200", "parents": [ "ab65be268adaae59da5b1306b425a7859f955669" ], "author": { "name": "Marc Zyngier", "email": "marc.zyngier@arm.com", "time": "Tue Sep 06 13:27:10 2011 +0100" }, "committer": { "name": "Marc Zyngier", "email": "marc.zyngier@arm.com", "time": "Tue Nov 15 18:14:02 2011 +0000" }, "message": "ARM: GIC: Make MULTI_IRQ_HANDLER mandatory\n\nNow that MULTI_IRQ_HANDLER is selected by all the in-tree\nGIC users, make it mandatory and remove the unused macros.\n\nSigned-off-by: Marc Zyngier \u003cmarc.zyngier@arm.com\u003e\n" }, { "commit": "041f777c93bab29565d999a292b9b9b533fe6f5e", "tree": "36eb5bcb073567baa23064666ccfbbf771b92196", "parents": [ "abd3ca51fba8bc200ae78e99bd1ac19c4e3b6781" ], "author": { "name": "Marc Zyngier", "email": "marc.zyngier@arm.com", "time": "Tue Sep 06 10:23:45 2011 +0100" }, "committer": { "name": "Marc Zyngier", "email": "marc.zyngier@arm.com", "time": "Tue Nov 15 18:14:00 2011 +0000" }, "message": "ARM: msm: convert SMP platforms to CONFIG_MULTI_IRQ_HANDLER\n\nConvert the SMP msm platforms to be using the gic_handle_irq\nfunction as their primary interrupt handler.\n\nTested-by: David Brown \u003cdavidb@codeaurora.org\u003e\nAcked-by: David Brown \u003cdavidb@codeaurora.org\u003e\nSigned-off-by: Marc Zyngier \u003cmarc.zyngier@arm.com\u003e\n" }, { "commit": "2b222a2971e4d73fc25c09aeb203c16c0c3c142e", "tree": "29dc51cdc5a66e6e49d0b7f6e42d7dda27ebc7ec", "parents": [ "a3d3ef9d4fd57cfd407c8d2d0a7daec000468ebf" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Mon Sep 19 10:54:04 2011 -0700" }, "committer": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Fri Nov 11 10:38:08 2011 -0800" }, "message": "msm: platsmp: Mark ioremapped memory as __iomem\n\nFixes a handful of sparse warnings.\n\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nSigned-off-by: David Brown \u003cdavidb@codeaurora.org\u003e\n" }, { "commit": "27fdb577435e336e4b00b9e51626f9002b88a86c", "tree": "74724584b0ede5becf3dafdee950071c4baec06e", "parents": [ "dde7d61e7f9bf0e844df375412ec5d51650db486" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Tue Nov 08 10:34:10 2011 -0800" }, "committer": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Thu Nov 10 10:36:34 2011 -0800" }, "message": "msm: timer: Use clockevents_config_and_register()\n\nDon\u0027t open code the min/max delta logic. Use the generic\nversion instead. Also expand the number of bits we can handle\nbecause there isn\u0027t anything that says we can\u0027t handle all 32\nbits.\n\nBefore:\n max_delta_ns: 122880426391799\n min_delta_ns: 122070\n mult: 140737\n shift: 32\n\nAfter:\n max_delta_ns: 131071523464981\n min_delta_ns: 122069\n mult: 70369\n shift: 31\n\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Marc Zyngier \u003cmarc.zyngier@arm.com\u003e\nSigned-off-by: David Brown \u003cdavidb@codeaurora.org\u003e\n" }, { "commit": "dde7d61e7f9bf0e844df375412ec5d51650db486", "tree": "eebad0b8c5cd9a47a6d230907cbdd1444d164396", "parents": [ "2081a6b57fba2717fa4b04fe978abad238e1f9e4" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Tue Nov 08 10:34:09 2011 -0800" }, "committer": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Thu Nov 10 10:36:33 2011 -0800" }, "message": "msm: timer: Setup interrupt after registering clockevent\n\nSome bootloaders may leave a pending interrupt for the timer and\nthus msm_timer_interrupt() has a check for a NULL event handler.\nUnmask and register for the interrupt after registering the\nclockevent so that we can get the NULL pointer check out of the\nfast path.\n\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Marc Zyngier \u003cmarc.zyngier@arm.com\u003e\nSigned-off-by: David Brown \u003cdavidb@codeaurora.org\u003e\n" }, { "commit": "2081a6b57fba2717fa4b04fe978abad238e1f9e4", "tree": "df2af31666b505eb4cf2a753b5917bbb6647fd94", "parents": [ "2a00c1068b2c1ae451e230ef8bd010d7b2f56f54" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Tue Nov 08 10:34:08 2011 -0800" }, "committer": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Thu Nov 10 10:36:33 2011 -0800" }, "message": "msm: timer: Remove SoC specific #ifdefs\n\nThe timer frequency is currently ifdefed in addition to setting\nthe DGT clock\u0027s divider value on SCORPIONMP targets. Setup the\nfrequency dynamically using the existing cpu_is_*() branches and\nassign a custom clocksource read function for 7x01a to get the\nshift out of the generic path.\n\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Marc Zyngier \u003cmarc.zyngier@arm.com\u003e\nSigned-off-by: David Brown \u003cdavidb@codeaurora.org\u003e\n" }, { "commit": "2a00c1068b2c1ae451e230ef8bd010d7b2f56f54", "tree": "a419230baad3776586482b070f4723ddec38a305", "parents": [ "a850c3f6446d30b47c984d3f9e45c935385fd592" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Tue Nov 08 10:34:07 2011 -0800" }, "committer": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Thu Nov 10 10:36:33 2011 -0800" }, "message": "msm: timer: Remove msm_clocks[] and simplify code\n\nWe can simplify the timer code now that we only use the DGT for\nthe clocksource and the GPT for the clockevent. Get rid of the\nmsm_clocks[] array and propagate the changes throughout the code.\nThis reduces the lines of code in this file and improves\nreadability.\n\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Marc Zyngier \u003cmarc.zyngier@arm.com\u003e\nSigned-off-by: David Brown \u003cdavidb@codeaurora.org\u003e\n" }, { "commit": "a850c3f6446d30b47c984d3f9e45c935385fd592", "tree": "a859b3efb8dbdfe7e6498f7b93028d39ef6c5397", "parents": [ "dd15ab814149df65187943c32ca09e4eeaac0047" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Tue Nov 08 10:34:06 2011 -0800" }, "committer": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Thu Nov 10 10:36:33 2011 -0800" }, "message": "msm: timer: Fix ONESHOT mode interrupts\n\nMSM timers don\u0027t support an interrupt enable/disable bit.\nTherefore, when the timer is free running it\u0027s possible for the\ncount to wrap and the match value to match again even though a\nset_next_event() call hasn\u0027t been made since the last match.\n\nWorkaround the lack of an interrupt enable bit by explicitly\nstopping the timer in the interrupt handler when the clockevent\nis in ONESHOT mode. This should prevent any possibility of the\ntimer wrapping and matching more than once per set_next_event().\n\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Marc Zyngier \u003cmarc.zyngier@arm.com\u003e\nSigned-off-by: David Brown \u003cdavidb@codeaurora.org\u003e\n" }, { "commit": "dd15ab814149df65187943c32ca09e4eeaac0047", "tree": "909789e3f7517e50882a42d5be7c1d99d3ad9856", "parents": [ "4a1840755294b2a14236ee7b9c74ede261156b09" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Tue Nov 08 10:34:05 2011 -0800" }, "committer": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Thu Nov 10 10:36:33 2011 -0800" }, "message": "msm: timer: Use GPT for clockevents and DGT for clocksource\n\nThe clocksource shouldn\u0027t stop ticking when the clockevent stops.\nThis is exactly what happens today with MSM timers. The same\nhardware is used for both the clockevent and the clocksource\nbecause the ratings of the two are the same.\n\nFix this by registering a clockevent based on the GPT and a\nclocksource based on the DGT. This removes any other possible\nconfiguration (e.g. a GPT clocksource and a DGT clockevent) but\nthat shouldn\u0027t be a big issue since we want higher precision\ntiming than high precision scheduling interrupts.\n\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Marc Zyngier \u003cmarc.zyngier@arm.com\u003e\nSigned-off-by: David Brown \u003cdavidb@codeaurora.org\u003e\n" }, { "commit": "4a1840755294b2a14236ee7b9c74ede261156b09", "tree": "6e38f4ea3a5a84b4f074b7d76778de4d022fd9d7", "parents": [ "2852ccaed4461365e6627fadb9e214a52fa3c600" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Tue Nov 08 10:34:04 2011 -0800" }, "committer": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Thu Nov 10 10:36:33 2011 -0800" }, "message": "msm: timer: Cleanup #includes and #defines\n\nRemove unused/unnecessary #defines, #includes, and use the BIT\nmacro appropriately.\n\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nSigned-off-by: David Brown \u003cdavidb@codeaurora.org\u003e\n" }, { "commit": "2852ccaed4461365e6627fadb9e214a52fa3c600", "tree": "3d3ede5633900e019e2e319f06419d98118ff23e", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Tue Nov 08 10:34:03 2011 -0800" }, "committer": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Thu Nov 10 10:36:32 2011 -0800" }, "message": "msm: timer: Tighten #ifdef for local timer support\n\nIt is more correct to only define the local timer support code\nwhen CONFIG_LOCAL_TIMERS\u003dy.\n\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nSigned-off-by: David Brown \u003cdavidb@codeaurora.org\u003e\n" }, { "commit": "a3d3ef9d4fd57cfd407c8d2d0a7daec000468ebf", "tree": "4894c7c2c68b9caa9e6842d317cde4800905e03e", "parents": [ "650e3f0d66ade2a614d854765dae3bbc9a87f58d" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Tue Nov 08 10:33:04 2011 -0800" }, "committer": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Thu Nov 10 10:17:06 2011 -0800" }, "message": "msm: Support DEBUG_LL on MSM8660 and MSM8960\n\nAdd support for DEBUG_LL on the 8660 and 8960 development boards.\nWhile we\u0027re here cleanup the uncompress.h code a bit. Avoid\nthe use of readl/writel as those are Linux specific APIs that\naren\u0027t guaranteed to work in the decompressor.\n\nCc: Nicolas Pitre \u003cnico@fluxnic.net\u003e\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nSigned-off-by: David Brown \u003cdavidb@codeaurora.org\u003e\n" }, { "commit": "650e3f0d66ade2a614d854765dae3bbc9a87f58d", "tree": "d849c9687ae7c9a3afcc9e49444eba167ec16394", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Tue Nov 08 10:33:03 2011 -0800" }, "committer": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Thu Nov 10 10:17:06 2011 -0800" }, "message": "ARM: msm: Consolidate and move DEBUG_LL to DEBUG_LL choice\n\nNow that DEBUG_LL is a choice we can move MSM\u0027s homegrown choice\nmenu to DEBUG_LL.\n\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nSigned-off-by: David Brown \u003cdavidb@codeaurora.org\u003e\n" }, { "commit": "3cdc3acc62527ab9544c2820b5e5da482a105240", "tree": "72e204d29562c5233517d5b84cbe72dd3e5d213b", "parents": [ "3c52b2be1804ed553df8df47213b58fedc93c5ab", "eca55f4d9c1d918c2aa95fb8a73a34e2ba8a1b11" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Nov 09 17:02:13 2011 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Nov 09 17:02:13 2011 -0800" }, "message": "Merge branch \u0027msm-fix\u0027 of git://codeaurora.org/quic/kernel/davidb/linux-msm into fixes\n" }, { "commit": "eca55f4d9c1d918c2aa95fb8a73a34e2ba8a1b11", "tree": "72f0aa283270bd13d34a928a75d37a1bcb618f47", "parents": [ "47a6770ac6cd0d28f14dd9e1b17705abe6f05e41" ], "author": { "name": "Marc Zyngier", "email": "marc.zyngier@arm.com", "time": "Tue Nov 08 13:07:36 2011 +0000" }, "committer": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Tue Nov 08 08:58:28 2011 -0800" }, "message": "ARM: msm: fix compilation flags for MSM_SCM\n\nCONFIG_MSM_SCM uses the smc instruction, which with some\ntoolchains requires a \".arch_extension\" directive.\n\nCc: David Brown \u003cdavidb@codeaurora.org\u003e\nSigned-off-by: Marc Zyngier \u003cmarc.zyngier@arm.com\u003e\nSigned-off-by: David Brown \u003cdavidb@codeaurora.org\u003e\n" }, { "commit": "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb", "tree": "faf7ad871d87176423ff9ed1d1ba4d9c688fc23f", "parents": [ "208bca0860406d16398145ddd950036a737c3c9d", "67b84999b1a8b1af5625b1eabe92146c5eb42932" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "message": "Merge branch \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\n* \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)\n Revert \"tracing: Include module.h in define_trace.h\"\n irq: don\u0027t put module.h into irq.h for tracking irqgen modules.\n bluetooth: macroize two small inlines to avoid module.h\n ip_vs.h: fix implicit use of module_get/module_put from module.h\n nf_conntrack.h: fix up fallout from implicit moduleparam.h presence\n include: replace linux/module.h with \"struct module\" wherever possible\n include: convert various register fcns to macros to avoid include chaining\n crypto.h: remove unused crypto_tfm_alg_modname() inline\n uwb.h: fix implicit use of asm/page.h for PAGE_SIZE\n pm_runtime.h: explicitly requires notifier.h\n linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h\n miscdevice.h: fix up implicit use of lists and types\n stop_machine.h: fix implicit use of smp.h for smp_processor_id\n of: fix implicit use of errno.h in include/linux/of.h\n of_platform.h: delete needless include \u003clinux/module.h\u003e\n acpi: remove module.h include from platform/aclinux.h\n miscdevice.h: delete unnecessary inclusion of module.h\n device_cgroup.h: delete needless include \u003clinux/module.h\u003e\n net: sch_generic remove redundant use of \u003clinux/module.h\u003e\n net: inet_timewait_sock doesnt need \u003clinux/module.h\u003e\n ...\n\nFix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in\n - drivers/media/dvb/frontends/dibx000_common.c\n - drivers/media/video/{mt9m111.c,ov6650.c}\n - drivers/mfd/ab3550-core.c\n - include/linux/dmaengine.h\n" }, { "commit": "367069f16e32e188d4687fe2c3e30f2ca583836f", "tree": "977f87038b75e53af9d132cba2f7a2aecb2fa005", "parents": [ "81a3c10ce8a7fd5bf9a06bfc38bd417512911831", "c72dbae971400e466ad9ff16c920cd6d9d8c55a1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 21:02:35 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 21:02:35 2011 -0700" }, "message": "Merge branch \u0027next/dt\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/dt\u0027 of git://git.linaro.org/people/arnd/arm-soc:\n ARM: gic: use module.h instead of export.h\n ARM: gic: fix irq_alloc_descs handling for sparse irq\n ARM: gic: add OF based initialization\n ARM: gic: add irq_domain support\n irq: support domains with non-zero hwirq base\n of/irq: introduce of_irq_init\n ARM: at91: add at91sam9g20 and Calao USB A9G20 DT support\n ARM: at91: dt: at91sam9g45 family and board device tree files\n arm/mx5: add device tree support for imx51 babbage\n arm/mx5: add device tree support for imx53 boards\n ARM: msm: Add devicetree support for msm8660-surf\n msm_serial: Add devicetree support\n msm_serial: Use relative resources for iomem\n\nFix up conflicts in arch/arm/mach-at91/{at91sam9260.c,at91sam9g45.c}\n" }, { "commit": "6585dea1f99cc2265582ff2e4cc1727062136e92", "tree": "57378ccfe0f9fde73081e1f9355d05dd4131e178", "parents": [ "16ee792e45cf0c97ce061fce03c36cab5551ec72", "97c24c1aa403e0d4ef7c1958db8459e488862b46" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:34:22 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:34:22 2011 -0700" }, "message": "Merge branch \u0027next/cross-platform\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/cross-platform\u0027 of git://git.linaro.org/people/arnd/arm-soc:\n arm/imx: use Kconfig choice for low-level debug UART selection\n ARM: realview: use Kconfig choice for debug UART selection\n ARM: plat-samsung: use Kconfig choice for debug UART selection\n ARM: versatile: convert logical CPU numbers to physical numbers\n ARM: ux500: convert logical CPU numbers to physical numbers\n ARM: shmobile: convert logical CPU numbers to physical numbers\n ARM: msm: convert logical CPU numbers to physical numbers\n ARM: exynos4: convert logical CPU numbers to physical numbers\n\nFix up trivial conflict (config DEBUG_S3C_UART move/split vs addition of\nARM_KPROBES_TEST option) in arch/arm/Kconfig.debug\n" }, { "commit": "47a6770ac6cd0d28f14dd9e1b17705abe6f05e41", "tree": "eeff9d16c6c8b58b4d88c3b1f29e3d77d3ed207b", "parents": [ "b4beb4bf9934d151bf4581a54ae028927374cb2a" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Tue Oct 25 09:35:19 2011 -0700" }, "committer": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Tue Nov 01 16:10:33 2011 -0700" }, "message": "msm: boards: Fix fallout from removal of machine_desc in fixup\n\nAfter 0744a3ee (ARM: platform fixups: remove mdesc argument to\nfixup function, 2010-12-20) the fixup functions introduced in\n9e775ad (ARM: 7012/1: Set proper TEXT_OFFSET for newer MSMs,\n2011-08-12) cause warnings like:\n\narch/arm/mach-msm/board-msm8x60.c:85: warning: initialization\nfrom incompatible pointer type\n\nFix them by removing the machine_desc argument from the fixup\nfunctions.\n\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nSigned-off-by: David Brown \u003cdavidb@codeaurora.org\u003e\n" }, { "commit": "dc28094b905a872f8884f1f1c48ca86b3b78583a", "tree": "7d598103fed9dd3e12c4526647eebe678c35ff34", "parents": [ "ecea4ab6d3d8bb4122522398200f1cd2a06af6d5" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Jul 31 16:17:29 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:30:50 2011 -0400" }, "message": "arm: Add export.h to ARM specific files as required.\n\nThese files all make use of one of the EXPORT_SYMBOL variants\nor the THIS_MODULE macro. So they will need \u003clinux/export.h\u003e\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "08cab72f91c8b28ffabfd143119bccdd4a115ad7", "tree": "ccd5583971caecd82bf2d1e62691bf6e0362d650", "parents": [ "86c1e5a74af11e4817ffa6d7748d9ac1353b5b53", "f37a53cc5d8a8fb199e41386d125d8c2ed9e54ef" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Oct 31 14:08:10 2011 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Oct 31 14:08:10 2011 +0100" }, "message": "Merge branch \u0027dt/gic\u0027 into next/dt\n\nConflicts:\n\tarch/arm/include/asm/localtimer.h\n\tarch/arm/mach-msm/board-msm8x60.c\n\tarch/arm/mach-omap2/board-generic.c\n" }, { "commit": "46b51ea2099fa2082342e52b8284aa828429b80b", "tree": "0a0d7bfe1aff036c86a2e7beacbd91398008bfb6", "parents": [ "1fdb24e969110fafea36d3b393bea438f702c87f", "a6029e1f75bb484c1f5bc68b6a8572e4024795bc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 28 14:16:11 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 28 14:16:11 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (83 commits)\n mmc: fix compile error when CONFIG_BLOCK is not enabled\n mmc: core: Cleanup eMMC4.5 conditionals\n mmc: omap_hsmmc: if multiblock reads are broken, disable them\n mmc: core: add workaround for controllers with broken multiblock reads\n mmc: core: Prevent too long response times for suspend\n mmc: recognise SDIO cards with SDIO_CCCR_REV 3.00\n mmc: sd: Handle SD3.0 cards not supporting UHS-I bus speed mode\n mmc: core: support HPI send command\n mmc: core: Add cache control for eMMC4.5 device\n mmc: core: Modify the timeout value for writing power class\n mmc: core: new discard feature support at eMMC v4.5\n mmc: core: mmc sanitize feature support for v4.5\n mmc: dw_mmc: modify DATA register offset\n mmc: sdhci-pci: add flag for devices that can support runtime PM\n mmc: omap_hsmmc: ensure pbias configuration is always done\n mmc: core: Add Power Off Notify Feature eMMC 4.5\n mmc: sdhci-s3c: fix potential NULL dereference\n mmc: replace printk with appropriate display macro\n mmc: core: Add default timeout value for CMD6\n mmc: sdhci-pci: add runtime pm support\n ...\n" }, { "commit": "1fdb24e969110fafea36d3b393bea438f702c87f", "tree": "47a1dfef8a259e7922285315f8a02d31b4efe2f1", "parents": [ "f362f98e7c445643d27c610bb7a86b79727b592e", "531a6a941745e1e045dd2a6bd09e1dc01247a5f3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 28 12:02:27 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 28 12:02:27 2011 -0700" }, "message": "Merge branch \u0027devel-stable\u0027 of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm\n\n* \u0027devel-stable\u0027 of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits)\n ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET\n ARM: gic, local timers: use the request_percpu_irq() interface\n ARM: gic: consolidate PPI handling\n ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H\n ARM: mach-s5p64x0: remove mach/memory.h\n ARM: mach-s3c64xx: remove mach/memory.h\n ARM: plat-mxc: remove mach/memory.h\n ARM: mach-prima2: remove mach/memory.h\n ARM: mach-zynq: remove mach/memory.h\n ARM: mach-bcmring: remove mach/memory.h\n ARM: mach-davinci: remove mach/memory.h\n ARM: mach-pxa: remove mach/memory.h\n ARM: mach-ixp4xx: remove mach/memory.h\n ARM: mach-h720x: remove mach/memory.h\n ARM: mach-vt8500: remove mach/memory.h\n ARM: mach-s5pc100: remove mach/memory.h\n ARM: mach-tegra: remove mach/memory.h\n ARM: plat-tcc: remove mach/memory.h\n ARM: mach-mmp: remove mach/memory.h\n ARM: mach-cns3xxx: remove mach/memory.h\n ...\n\nFix up mostly pretty trivial conflicts in:\n - arch/arm/Kconfig\n - arch/arm/include/asm/localtimer.h\n - arch/arm/kernel/Makefile\n - arch/arm/mach-shmobile/board-ap4evb.c\n - arch/arm/mach-u300/core.c\n - arch/arm/mm/dma-mapping.c\n - arch/arm/mm/proc-v7.S\n - arch/arm/plat-omap/Kconfig\nlargely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP -\u003e\nCONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and\naddition of NEED_MACH_MEMORY_H next to HAVE_IDE.\n" }, { "commit": "ca90666287401b475d9e0becf85bd02f069f1de8", "tree": "ad4dd789f8d5ab639c78997d3655b94fcbf660ef", "parents": [ "60325f0c6ee7c6b68f95aaa643260fb33d4bdd88", "374e759db148d1e874e3afb76707082af67e0984" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 27 08:39:10 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 27 08:39:10 2011 +0200" }, "message": "Merge branch \u0027gpio\u0027 of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm\n\n* \u0027gpio\u0027 of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (43 commits)\n ARM: 7135/1: ep93xx: bring back missing \u003cmach/gpio.h\u003e\n ARM: 7104/1: plat-pxa: break out GPIO driver specifics\n ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem\n ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics\n ARM: 7101/1: arm/tegra: Replace \u003cmach/gpio.h\u003e with \u003cmach/gpio-tegra.h\u003e\n ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h\n ARM: 7083/1: rewrite U300 GPIO to use gpiolib\n ARM: 7074/1: gpio: davinci: eliminate unused variable warnings\n ARM: 7063/1: Orion: gpio: add missing include of linux/types.h\n ARM: 7055/1: arm/tegra: mach/gpio.h: include linux/types.h to fix build\n ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpio\n ARM: 7053/1: gpio/tegra: Implement gpio_chip.to_irq\n ARM: 7052/1: gpio/tegra: Remove use of irq_to_gpio\n ARM: 7057/1: mach-pnx4008: rename GPIO header\n ARM: 7056/1: plat-nomadik: kill off \u003cplat/gpio.h\u003e\n ARM: 7050/1: mach-sa1100: delete irq_to_gpio() function\n ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem\n ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics\n ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem\n ARM: 7043/1: mach-ixp2000: rename GPIO header\n ...\n\nFix up trivial conflicts in arch/arm/mach-u300/Kconfig manually\n" }, { "commit": "4a92fe80becbbee650cfad8457ad0e5cd97ed974", "tree": "1a08d4869b1119a85109825d7a8cf8525557bc8f", "parents": [ "514d9eda92654430369060b91f7472bb198e7904" ], "author": { "name": "Sahitya Tummala", "email": "stummala@codeaurora.org", "time": "Mon May 02 18:07:43 2011 +0530" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Wed Oct 26 15:43:37 2011 -0400" }, "message": "msm: mmc: Remove \"pio_irq\" resource\n\nOn some targets, MCI_IRQ_MASK1 is not routed to the MSM in which\ncase only \"cmd_irq\" must be used even for PIO. With this change,\nall the targets will use only \"cmd_irq\" for both CMD and PIO.\n\nSigned-off-by: Sahitya Tummala \u003cstummala@codeaurora.org\u003e\nSigned-off-by: David Brown \u003cdavidb@codeaurora.org\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "e91957e70d2aea529ff2055b8fbd575f2d7b8c3b", "tree": "0ca76c59c04fcc10ad803b4b1312754670ed707b", "parents": [ "435f3e385962e2b34855e9b34f8b95717c1016a2" ], "author": { "name": "Alexander Tarasikov", "email": "alexander.tarasikov@gmail.com", "time": "Sun Aug 21 15:52:44 2011 +0400" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Wed Oct 26 15:43:36 2011 -0400" }, "message": "msm: Implement init_card operation for MSM SDCC\n\nThis allows boards with non-standard sdio cards to fill the CIS/CCCR data.\nIt is particularly important for old msm72k boards using wl1251.\nAlso drop the obsolete embedded_sdio_data structure from the header\nas it was intended to surve a similiar purpose but was not implemented.\n\nSigned-off-by: Alexander Tarasikov \u003calexander.tarasikov@gmail.com\u003e\nAcked-by: Sahitya Tummala \u003cstummala@codeaurora.org\u003e\n[davidb: minor formatting cleanup]\nSigned-off-by: David Brown \u003cdavidb@codeaurora.org\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "7e0bb71e75020348bee523720a0c2f04cc72f540", "tree": "1a22d65bbce34e8cc0f82c543c9486ffb58332f7", "parents": [ "b9e2780d576a010d4aba1e69f247170bf3718d6b", "0ab1e79b825a5cd8aeb3b34d89c9a89dea900056" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 15:18:39 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 15:18:39 2011 +0200" }, "message": "Merge branch \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\n* \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (63 commits)\n PM / Clocks: Remove redundant NULL checks before kfree()\n PM / Documentation: Update docs about suspend and CPU hotplug\n ACPI / PM: Add Sony VGN-FW21E to nonvs blacklist.\n ARM: mach-shmobile: sh7372 A4R support (v4)\n ARM: mach-shmobile: sh7372 A3SP support (v4)\n PM / Sleep: Mark devices involved in wakeup signaling during suspend\n PM / Hibernate: Improve performance of LZO/plain hibernation, checksum image\n PM / Hibernate: Do not initialize static and extern variables to 0\n PM / Freezer: Make fake_signal_wake_up() wake TASK_KILLABLE tasks too\n PM / Hibernate: Add resumedelay kernel param in addition to resumewait\n MAINTAINERS: Update linux-pm list address\n PM / ACPI: Blacklist Vaio VGN-FW520F machine known to require acpi_sleep\u003dnonvs\n PM / ACPI: Blacklist Sony Vaio known to require acpi_sleep\u003dnonvs\n PM / Hibernate: Add resumewait param to support MMC-like devices as resume file\n PM / Hibernate: Fix typo in a kerneldoc comment\n PM / Hibernate: Freeze kernel threads after preallocating memory\n PM: Update the policy on default wakeup settings\n PM / VT: Cleanup #if defined uglyness and fix compile error\n PM / Suspend: Off by one in pm_suspend()\n PM / Hibernate: Include storage keys in hibernation image on s390\n ...\n" }, { "commit": "bdf4e9482360a3ddc1619efbd5d1c928ede8c3fa", "tree": "b02319e809c5b8abfca85409a11472775e27f597", "parents": [ "06afb1a087d49ae0f676b2e5b9ffe5f4b3aba355", "eb0474544bc16a9dab53b26abd846e86ba814eb1" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Oct 25 08:19:59 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Oct 25 08:19:59 2011 +0100" }, "message": "Merge branch \u0027misc\u0027 into for-linus\n\nConflicts:\n\tarch/arm/mach-integrator/integrator_ap.c\n" }, { "commit": "06afb1a087d49ae0f676b2e5b9ffe5f4b3aba355", "tree": "5377c063ed07aed23eb9da0bfecfca307f8da0bc", "parents": [ "c3b92c8787367a8bb53d57d9789b558f1295cc96", "7816e210a7e4681fb775bbb57bffbef3cc4aa456", "f73765fcb8bb79e80af58059441eb931679e68c0", "70e5f5efcc933af55a3a18efdb3b2edd3eb510ec", "91c2ebb90b1890abc648ba9dec5608cbc97e1cb9", "daece59689e76ed55d8863cae04993679a8e844e", "d7c5d0dcffb3b5702d9477faceff4b8398e6fed0", "a06f916b7a9b57447ceb875eb0a89f1a66b31bca" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Oct 25 08:19:29 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Oct 25 08:19:29 2011 +0100" }, "message": "Merge branches \u0027arnd-randcfg-fixes\u0027, \u0027debug\u0027, \u0027io\u0027 (early part), \u0027l2x0\u0027, \u0027p2v\u0027, \u0027pgt\u0027 (early part) and \u0027smp\u0027 into for-linus\n" }, { "commit": "34471a9168c8bfd7f0d00989a7b0797ad27d585e", "tree": "847af3ec746c6357902cf57c7e12ba55a35eed30", "parents": [ "cefd3e71efca6f4ef7f06f1fc507771d76072741", "28af690a284dfcb627bd69d0963db1c0f412cb8c" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Oct 23 14:42:30 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Oct 23 14:42:30 2011 +0100" }, "message": "Merge branch \u0027ppi-irq-core-for-rmk\u0027 of git://github.com/mzyngier/arm-platforms into devel-stable\n" }, { "commit": "28af690a284dfcb627bd69d0963db1c0f412cb8c", "tree": "6daa595281c87b5bfee4cca79492a724deb1cfbc", "parents": [ "292b293ceef2eda1f96f0c90b96e954d7bdabd1c" ], "author": { "name": "Marc Zyngier", "email": "marc.zyngier@arm.com", "time": "Fri Jul 22 12:52:37 2011 +0100" }, "committer": { "name": "Marc Zyngier", "email": "marc.zyngier@arm.com", "time": "Sun Oct 23 13:32:33 2011 +0100" }, "message": "ARM: gic, local timers: use the request_percpu_irq() interface\n\nThis patch remove the hardcoded link between local timers and PPIs,\nand convert the PPI users (TWD, MCT and MSM timers) to the new\n*_percpu_irq interface. Also some collateral cleanup\n(local_timer_ack() is gone, and the interrupt handler is strictly\nprivate to each driver).\n\nPPIs are now useable for more than just the local timers.\n\nAdditional testing by David Brown (msm8250 and msm8660) and\nShawn Guo (imx6q).\n\nCc: David Brown \u003cdavidb@codeaurora.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: David Brown \u003cdavidb@codeaurora.org\u003e\nTested-by: David Brown \u003cdavidb@codeaurora.org\u003e\nTested-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Marc Zyngier \u003cmarc.zyngier@arm.com\u003e\n" }, { "commit": "292b293ceef2eda1f96f0c90b96e954d7bdabd1c", "tree": "931da77e74e1aee404ffb61f8ffe2f6acb73f80c", "parents": [ "88b6fc8c57055590d8e9538f6faa85483db8c366" ], "author": { "name": "Marc Zyngier", "email": "marc.zyngier@arm.com", "time": "Wed Jul 20 16:24:14 2011 +0100" }, "committer": { "name": "Marc Zyngier", "email": "marc.zyngier@arm.com", "time": "Sun Oct 23 13:32:29 2011 +0100" }, "message": "ARM: gic: consolidate PPI handling\n\nPPI handling is a bit of an odd beast. It uses its own low level\nhandling code and is hardwired to the local timers (hence lacking\na registration interface).\n\nInstead, switch the low handling to the normal SPI handling code.\nPPIs are handled by the handle_percpu_devid_irq flow.\n\nThis also allows the removal of some duplicated code.\n\nCc: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nCc: David Brown \u003cdavidb@codeaurora.org\u003e\nCc: Bryan Huntsman \u003cbryanh@codeaurora.org\u003e\nCc: Tony Lindgren \u003ctony@atomide.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Magnus Damm \u003cmagnus.damm@gmail.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: David Brown \u003cdavidb@codeaurora.org\u003e\nTested-by: David Brown \u003cdavidb@codeaurora.org\u003e\nTested-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Marc Zyngier \u003cmarc.zyngier@arm.com\u003e\n" }, { "commit": "a06f916b7a9b57447ceb875eb0a89f1a66b31bca", "tree": "a8a9d7c5e91a08f253107ffcf066dbeb4f7d9d34", "parents": [ "5a567d78c437e3be1c512734cdfe64b4ae6b82d7" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Oct 20 22:04:18 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Oct 20 22:06:57 2011 +0100" }, "message": "ARM: smp: fix clipping of number of CPUs\n\nRather than clipping the number of CPUs using the compile-time NR_CPUS\nconstant, use the runtime nr_cpu_ids value instead. This allows the\nnr_cpus command line option to work as expected.\n\nCc: \u003cstable@kernel.org\u003e\nReported-by: Mark Salter \u003cmsalter@redhat.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "1d3cfb34f9605578b4f733acba4affa751b2e4a2", "tree": "f4a0fe4999b0741f158f9732ab859c1b31085b30", "parents": [ "2f41c36b07af71bb308ff8f1739481b022476080" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Tue Aug 09 12:02:27 2011 +0100" }, "committer": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Mon Oct 17 10:01:11 2011 +0100" }, "message": "ARM: msm: convert logical CPU numbers to physical numbers\n\nThis patch uses the new cpu_logical_map() macro for converting logical\nCPU numbers into physical numbers when dealing with the pen_release\nvariable in the SMP boot and CPU hotplug paths.\n\nTested-and-acked-by: David Brown \u003cdavidb@codeaurora.org\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\n" }, { "commit": "0744a3ee37784dfda0025963716a36c3f1e3adcc", "tree": "0f84ecdbda2a0abf8cf12031fb47cc98ab56eef1", "parents": [ "87e040b6456fd3416a1f6831c1eedaef5c0a94ff" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Dec 20 10:37:50 2010 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Oct 17 09:13:41 2011 +0100" }, "message": "ARM: platform fixups: remove mdesc argument to fixup function\n\nGet rid of the mdesc pointer in the fixup function call. No one uses\nthe mdesc pointer, it shouldn\u0027t be modified anyway, and we can\u0027t wrap\nit, so let\u0027s remove it.\n\nPlatform files found by:\n\n $ regexp\u003d$(git grep -h \u0027\\.fixup.*\u003d\u0027 arch/arm |\n\t\tsed \u0027s!.*\u003d *\\([^,]*\\),* *!\\1!\u0027 | sort -u |\n\t\ttr \u0027\\n\u0027 \u0027|\u0027 | sed \u0027s,|$,,;s,|,\\\\|,g\u0027)\n $ git grep $regexp arch/arm\n\nAcked-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "40c6d8aee40e373db75e6b0b4230fc8e8259d7a6", "tree": "28dd575d38399a08b3c344596aafa81f554c05bb", "parents": [ "cd227fbffa9e971ee80065de772d3201c73e1670" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Aug 17 14:24:52 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Oct 17 09:12:40 2011 +0100" }, "message": "ARM: 7022/1: allow to detect conflicting zreladdrs\n\nBoards used to specify zreladdr in their Makefile.boot with\nzreladdr-y :\u003d x, so conflicting zreladdrs were silently overwritten.\nThis patch changes this to zreladdr-y +\u003d x, so that we end\nup with multiple words in zreladdr in such a case. We can\ndetect this later and complain if necessary.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "9d25544968f831e97e858bd8ec2933f225126ca8", "tree": "28433ef020d658a1c8a78a7e078bf95b3c49834c", "parents": [ "d8c9e024e300cc3dfccf96050368880ef1669426" ], "author": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Tue Jul 05 22:52:54 2011 -0400" }, "committer": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Thu Oct 13 12:49:37 2011 -0400" }, "message": "ARM: mach-msm: remove mach/memory.h\n\nSigned-off-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\n" }, { "commit": "639da5ee374ba8f070690bbd355ca30139ce145a", "tree": "21ec04820d870a0cd21f257193057355baa3cbc1", "parents": [ "57c89707dae01e0142e7185b6e8ff71b120f4c4d" ], "author": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Wed Aug 31 22:55:46 2011 -0400" }, "committer": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Mon Sep 26 10:11:25 2011 -0400" }, "message": "ARM: add an extra temp register to the low level debugging addruart macro\n\nSome platforms (like OMAP not to name it) are doing rather complicated\nhacks just to determine the base UART address to use. Let\u0027s give their\naddruart macro some slack by providing an extra work register which will\nallow for much needed cleanups.\n\nThis is basically a no-op as this commit is only adding the extra argument\nto the macro but no one is using it yet.\n\nSigned-off-by: nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@ti.com\u003e\n" }, { "commit": "56e2d8a68803be438211130f58ff02c277a2daaf", "tree": "051aa9feb368d6893fa0e99421c253c9612f6dc8", "parents": [ "cfdad2aba7398021f6eec415b9271b9cb40065f9" ], "author": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Thu Aug 04 02:01:02 2011 -0700" }, "committer": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Mon Aug 29 12:47:36 2011 -0700" }, "message": "ARM: msm: Add devicetree support for msm8660-surf\n\nAdds support for booting via device tree with a simple serial console.\n\nChange-Id: I7f175b8db21928cd13e0fb49f3eed74966a2696f\nSigned-off-by: David Brown \u003cdavidb@codeaurora.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "96f90c791512bf8ceb50572a0e65d4cabb665c60", "tree": "33ed5d6e4ce2ef005a43b0a5e2b9a70e3866d7f4", "parents": [ "ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893", "daece59689e76ed55d8863cae04993679a8e844e" ], "author": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Mon Aug 29 15:29:00 2011 -0400" }, "committer": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Mon Aug 29 15:29:00 2011 -0400" }, "message": "Merge the enabling by default of ARM_PATCH_PHYS_VIRT\n\nConflicts:\n\tarch/arm/mach-msm/board-msm7x30.c\n" }, { "commit": "e8db0be1245de16a6cc6365506abc392c3c212d4", "tree": "01cf446568080c06c8797262554f3b0f758ae137", "parents": [ "b5e8d269d814763d597ccc0108d1fa6639ad35a1" ], "author": { "name": "Jean Pihet", "email": "j-pihet@ti.com", "time": "Thu Aug 25 15:35:03 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Thu Aug 25 15:35:03 2011 +0200" }, "message": "PM QoS: Move and rename the implementation files\n\nThe PM QoS implementation files are better named\nkernel/power/qos.c and include/linux/pm_qos.h.\n\nThe PM QoS support is compiled under the CONFIG_PM option.\n\nSigned-off-by: Jean Pihet \u003cj-pihet@ti.com\u003e\nAcked-by: markgross \u003cmarkgross@thegnar.org\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" } ], "next": "f631dd411e478b781878d9e5d932b9ae8efa9076" }