)]}' { "log": [ { "commit": "aa303f2c06c0f3b42190b7e56c16bc856b1a1b28", "tree": "a916c85bbdd3a23e27c1f71aa90afe8a179d99bb", "parents": [ "4a7c1ff2362b7bfbc04990f42c21cefdff57f997", "6f36a806e588f2ce62571a1859ea1d7f2c7dde83" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 18 13:46:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 18 13:46:13 2012 -0800" }, "message": "Merge branch \u0027for-linus/i2c-33\u0027 of git://git.fluff.org/bjdooks/linux\n\n* \u0027for-linus/i2c-33\u0027 of git://git.fluff.org/bjdooks/linux:\n i2c-eg20t: Change-company-name-OKI-SEMICONDUCTOR to LAPIS Semiconductor\n i2c-eg20t: Support new device LAPIS Semiconductor ML7831 IOH\n i2c-eg20t: modified the setting of transfer rate.\n i2c-eg20t: use i2c_add_numbered_adapter to get a fixed bus number\n i2c: OMAP: Add DT support for i2c controller\n I2C: OMAP: NACK without STP\n I2C: OMAP: correct SYSC register offset for OMAP4\n" }, { "commit": "57f2685c16fa8e0cb86e4bc7c8ac33bfed943819", "tree": "96a42fe632687c8486c250c4805bf1d4c9c34d19", "parents": [ "488a9d018256dc9f29e041c0360445b6d25eea9a", "e08b881a69d638175bfa99b5af4d72b731633ea7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 18:40:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 18:40:24 2012 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\n* \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma: (53 commits)\n ARM: mach-shmobile: specify CHCLR registers on SH7372\n dma: shdma: fix runtime PM: clear channel buffers on reset\n dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit\n dmaengine/ste_dma40: clear LNK on channel startup\n dmaengine: intel_mid_dma: remove legacy pm interface\n ASoC: mxs: correct \u0027direction\u0027 of device_prep_dma_cyclic\n dmaengine: intel_mid_dma: error path fix\n dmaengine: intel_mid_dma: locking and freeing fixes\n mtd: gpmi-nand: move to dma_transfer_direction\n mtd: fix compile error for gpmi-nand\n mmc: mxs-mmc: fix the dma_transfer_direction migration\n dmaengine: add DMA_TRANS_NONE to dma_transfer_direction\n dma: mxs-dma: Don\u0027t use CLKGATE bits in CTRL0 to disable DMA channels\n dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe\n dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled.\n dma: mxs-dma: fix a typo in comment\n DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove\n video i.MX IPU: Fix display connections\n i.MX IPU DMA: Fix wrong burstsize settings\n dmaengine/ste_dma40: allow fixed physical channel\n ...\n\nFix up conflicts in drivers/dma/{Kconfig,mxs-dma.c,pl330.c}\n\nThe conflicts looked pretty trivial, but I\u0027ll ask people to verify them.\n" }, { "commit": "6145197be6cc0583fa1a2f4ec1079d366137061e", "tree": "ebade77ae1a25a56e822feed87c7135d01500083", "parents": [ "78e1cf42ee3efd2c3e8af0b97cf0a0a570cc0c1f" ], "author": { "name": "Benoit Cousson", "email": "b-cousson@ti.com", "time": "Thu Dec 22 15:56:36 2011 +0100" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue Jan 17 22:44:57 2012 +0000" }, "message": "i2c: OMAP: Add DT support for i2c controller\n\nAdd initial DT support to retrieve the frequency using a\nDT attribute instead of the pdata pointer if of_node exist.\n\nAdd documentation for omap i2c controller binding.\n\nBased on original patches from Manju and Grant.\n\nSigned-off-by: Benoit Cousson \u003cb-cousson@ti.com\u003e\nCc: Ben Dooks \u003cben-linux@fluff.org\u003e\nReviewed-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Kevin Hilman \u003ckhilman@ti.com\u003e\n" }, { "commit": "81d48f0aee544885c39ef6e1ffb1175f276e6adf", "tree": "093f37084c133795e4ce71befa57185328737171", "parents": [ "f5e4e20faa1eee3feaa0394897bbd1aca544e809", "661db794eb8179c7bea02f159bb691a2fff4a8e0", "14c173eb63432ba5d0783b6c4b23a8fe0c76fb0f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 13:25:55 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 13:25:55 2012 -0800" }, "message": "Merge tags \u0027devicetree-for-linus\u0027 and \u0027spi-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n2nd set of device tree changes and SPI bug fixes for v3.3\n\n* tag \u0027devicetree-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n of/irq: Add interrupts-names property to name an irq resource\n of/address: Add reg-names property to name an iomem resource\n\n* tag \u0027spi-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n spi/tegra: depend instead of select TEGRA_SYSTEM_DMA\n" }, { "commit": "21ebd6c68b5511b55f4f456e4ba17c2d711e3617", "tree": "2f4f98568a7a52ab6734fb190d0cbf6f9c1c6492", "parents": [ "4b8be38cf782f8ebebc089083fa0572ade79d7ca", "74d836c4142e5d100f8d9a1b2ee3003c2ed7109d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 13 20:43:32 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 13 20:43:32 2012 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (59 commits)\n rtc: max8925: Add function to work as wakeup source\n mfd: Add pm ops to max8925\n mfd: Convert aat2870 to dev_pm_ops\n mfd: Still check other interrupts if we get a wm831x touchscreen IRQ\n mfd: Introduce missing kfree in 88pm860x probe routine\n mfd: Add S5M series configuration\n mfd: Add s5m series irq driver\n mfd: Add S5M core driver\n mfd: Improve mc13xxx dt binding document\n mfd: Fix stmpe section mismatch\n mfd: Fix stmpe build warning\n mfd: Fix STMPE I2c build failure\n mfd: Constify aat2870-core i2c_device_id table\n gpio: Add support for stmpe variant 801\n mfd: Add support for stmpe variant 801\n mfd: Add support for stmpe variant 610\n mfd: Add support for STMPE SPI interface\n mfd: Separate out STMPE controller and interface specific code\n misc: Remove max8997-muic sysfs attributes\n mfd: Remove unused wm831x_irq_data_to_mask_reg()\n ...\n\nFix up trivial conflict in drivers/leds/Kconfig due to addition of\nLEDS_MAX8997 and LEDS_TCA6507 next to each other.\n" }, { "commit": "a429638cac1e5c656818a45aaff78df7b743004e", "tree": "0465e0d7a431bff97a3dd5a1f91d9b30c69ae0d8", "parents": [ "5cf9a4e69c1ff0ccdd1d2b7404f95c0531355274", "9e4ce164ee3a1d07580f017069c25d180b0aa785" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 08:00:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 08:00:30 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (526 commits)\n ASoC: twl6040 - Add method to query optimum PDM_DL1 gain\n ALSA: hda - Fix the lost power-setup of seconary pins after PM resume\n ALSA: usb-audio: add Yamaha MOX6/MOX8 support\n ALSA: virtuoso: add S/PDIF input support for all Xonars\n ALSA: ice1724 - Support for ooAoo SQ210a\n ALSA: ice1724 - Allow card info based on model only\n ALSA: ice1724 - Create capture pcm only for ADC-enabled configurations\n ALSA: hdspm - Provide unique driver id based on card serial\n ASoC: Dynamically allocate the rtd device for a non-empty release()\n ASoC: Fix recursive dependency due to select ATMEL_SSC in SND_ATMEL_SOC_SSC\n ALSA: hda - Fix the detection of \"Loopback Mixing\" control for VIA codecs\n ALSA: hda - Return the error from get_wcaps_type() for invalid NIDs\n ALSA: hda - Use auto-parser for HP laptops with cx20459 codec\n ALSA: asihpi - Fix potential Oops in snd_asihpi_cmode_info()\n ALSA: hdsp - Fix potential Oops in snd_hdsp_info_pref_sync_ref()\n ALSA: hda/cirrus - support for iMac12,2 model\n ASoC: cx20442: add bias control over a platform provided regulator\n ALSA: usb-audio - Avoid flood of frame-active debug messages\n ALSA: snd-usb-us122l: Delete calls to preempt_disable\n mfd: Put WM8994 into cache only mode when suspending\n ...\n\nFix up trivial conflicts in:\n - arch/arm/mach-s3c64xx/mach-crag6410.c:\n\trenamed speyside_wm8962 to tobermory, added littlemill right\n\tnext to it\n - drivers/base/regmap/{regcache.c,regmap.c}:\n\tduplicate diff that had already come in with other changes in\n\tthe regmap tree\n" }, { "commit": "b24ca57e7625bc304e77bc429693ad32a691eb16", "tree": "770aa389c6e763cf37776a35e85ff1e41958b1e9", "parents": [ "6296e5d3c067df41980a5fd09ad4cc6765f79bb9", "913272b3864d6da89c70d9fc2c30ccb57794b369" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 18:53:05 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 18:53:05 2012 -0800" }, "message": "Merge git://git.infradead.org/battery-2.6\n\n* git://git.infradead.org/battery-2.6: (68 commits)\n power_supply: Mark da9052 driver as broken\n power_supply: Drop usage of nowarn variant of sysfs_create_link()\n s3c_adc_battery: Average over more than one adc sample\n power_supply: Add DA9052 battery driver\n isp1704_charger: Fix missing check\n jz4740-battery: Fix signedness bug\n power_supply: Assume mains power by default\n sbs-battery: Fix devicetree match table\n ARM: rx51: Add bq27200 i2c board info\n sbs-battery: Change power supply name\n devicetree-bindings: Propagate bq20z75-\u003esbs rename to dt bindings\n devicetree-bindings: Add vendor entry for Smart Battery Systems\n sbs-battery: Rename internals to new name\n bq20z75: Rename to sbs-battery\n wm97xx_battery: Use DEFINE_MUTEX() for work_lock\n max8997_charger: Remove duplicate module.h\n lp8727_charger: Some minor fixes for the header\n lp8727_charger: Add header file\n power_supply: Convert drivers/power/* to use module_platform_driver()\n power_supply: Add \"unknown\" in power supply type\n ...\n" }, { "commit": "06792c4dde2ad143928cc95c1ba218c6269c494b", "tree": "92bdd4631612c9e3d8e5f6f06839f75c5473300a", "parents": [ "4690dfa8cd66c37fbe99bb8cd5baa86102110776", "166c0eaedfc3157dc1394c27e827add19f05fb27" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 17:39:40 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 17:39:40 2012 -0800" }, "message": "Merge tag \u0027for-linux-3.3-merge-window\u0027 of git://linux-c6x.org/git/projects/linux-c6x-upstreaming\n\n* tag \u0027for-linux-3.3-merge-window\u0027 of git://linux-c6x.org/git/projects/linux-c6x-upstreaming: (29 commits)\n C6X: replace tick_nohz_stop/restart_sched_tick calls\n C6X: add register_cpu call\n C6X: deal with memblock API changes\n C6X: fix timer64 initialization\n C6X: fix layout of EMIFA registers\n C6X: MAINTAINERS\n C6X: DSCR - Device State Configuration Registers\n C6X: EMIF - External Memory Interface\n C6X: general SoC support\n C6X: library code\n C6X: headers\n C6X: ptrace support\n C6X: loadable module support\n C6X: cache control\n C6X: clocks\n C6X: build infrastructure\n C6X: syscalls\n C6X: interrupt handling\n C6X: time management\n C6X: signal management\n ...\n" }, { "commit": "40ba587923ae67090d9f141c1d3c951be5c1420e", "tree": "342a72fc0ee13a0d2496ef970b64dfeadf1355d2", "parents": [ "54c2c5761febcca46c8037d3a81612991e6c209a", "6b550f9495947fc279d12c38feaf98500e8d0646" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:42:48 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:42:48 2012 -0800" }, "message": "Merge branch \u0027akpm\u0027 (aka \"Andrew\u0027s patch-bomb\")\n\nAndrew elucidates:\n - First installmeant of MM. We have a HUGE number of MM patches this\n time. It\u0027s crazy.\n - MAINTAINERS updates\n - backlight updates\n - leds\n - checkpatch updates\n - misc ELF stuff\n - rtc updates\n - reiserfs\n - procfs\n - some misc other bits\n\n* akpm: (124 commits)\n user namespace: make signal.c respect user namespaces\n workqueue: make alloc_workqueue() take printf fmt and args for name\n procfs: add hidepid\u003d and gid\u003d mount options\n procfs: parse mount options\n procfs: introduce the /proc/\u003cpid\u003e/map_files/ directory\n procfs: make proc_get_link to use dentry instead of inode\n signal: add block_sigmask() for adding sigmask to current-\u003eblocked\n sparc: make SA_NOMASK a synonym of SA_NODEFER\n reiserfs: don\u0027t lock root inode searching\n reiserfs: don\u0027t lock journal_init()\n reiserfs: delay reiserfs lock until journal initialization\n reiserfs: delete comments referring to the BKL\n drivers/rtc/interface.c: fix alarm rollover when day or month is out-of-range\n drivers/rtc/rtc-twl.c: add DT support for RTC inside twl4030/twl6030\n drivers/rtc/: remove redundant spi driver bus initialization\n drivers/rtc/rtc-jz4740.c: make jz4740_rtc_driver static\n drivers/rtc/rtc-mc13xxx.c: make mc13xxx_rtc_idtable static\n rtc: convert drivers/rtc/* to use module_platform_driver()\n drivers/rtc/rtc-wm831x.c: convert to devm_kzalloc()\n drivers/rtc/rtc-wm831x.c: remove unused period IRQ handler\n ...\n" }, { "commit": "948170f8944dfd29d13612fff48110a9814daeb1", "tree": "6d88f55925e407c096db6a6bc4df4ad3b5c2448d", "parents": [ "6c3fb55793f79bc975df0494c4d56ea6f0b0cc45" ], "author": { "name": "Benoit Cousson", "email": "b-cousson@ti.com", "time": "Tue Jan 10 15:10:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:53 2012 -0800" }, "message": "drivers/rtc/rtc-twl.c: add DT support for RTC inside twl4030/twl6030\n\nAdd the DT support for the TI rtc-twl present in the twl4030 and twl6030\ndevices.\n\nSigned-off-by: Benoit Cousson \u003cb-cousson@ti.com\u003e\nAcked-by: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7b3480f8b701170c046e1ed362946f5f0d005e13", "tree": "bd25e05b4f35699689b485480dddf24f840f80af", "parents": [ "1c8106528aa6bf16b3f457de80df1cf7462a49a4", "b60ef99c1164a8ad346cf41f9e71acfffb6d25a6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 13:45:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 13:45:22 2012 -0800" }, "message": "Merge tag \u0027for-linus-3.3\u0027 of git://git.infradead.org/mtd-2.6\n\nMTD pull for 3.3\n\n* tag \u0027for-linus-3.3\u0027 of git://git.infradead.org/mtd-2.6: (113 commits)\n mtd: Fix dependency for MTD_DOC200x\n mtd: do not use mtd-\u003eblock_markbad directly\n logfs: do not use \u0027mtd-\u003eblock_isbad\u0027 directly\n mtd: introduce mtd_can_have_bb helper\n mtd: do not use mtd-\u003esuspend and mtd-\u003eresume directly\n mtd: do not use mtd-\u003elock, unlock and is_locked directly\n mtd: do not use mtd-\u003esync directly\n mtd: harmonize mtd_writev usage\n mtd: do not use mtd-\u003elock_user_prot_reg directly\n mtd: mtd-\u003ewrite_user_prot_reg directly\n mtd: do not use mtd-\u003eread_*_prot_reg directly\n mtd: do not use mtd-\u003eget_*_prot_info directly\n mtd: do not use mtd-\u003eread_oob directly\n mtd: mtdoops: do not use mtd-\u003epanic_write directly\n romfs: do not use mtd-\u003eget_unmapped_area directly\n mtd: do not use mtd-\u003eget_unmapped_area directly\n mtd: do use mtd-\u003epoint directly\n mtd: introduce mtd_has_oob helper\n mtd: mtdcore: export symbols cleanup\n mtd: clean-up the default_mtd_writev function\n ...\n\nFix up trivial edit/remove conflict in drivers/staging/spectra/lld_mtd.c\n" }, { "commit": "dbe950f201a8edd353b0bd9079e8d536ee4ce37c", "tree": "dffbada6b3d33cc67383758570de22b4f45693b6", "parents": [ "f62f61917d72c1fb0101ad405664f6fc868d676b", "da733563be5a9da26fe81d9f007262d00b846e22" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:55:52 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:55:52 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (64 commits)\n Input: tc3589x-keypad - add missing kerneldoc\n Input: ucb1400-ts - switch to using dev_xxx() for diagnostic messages\n Input: ucb1400_ts - convert to threaded IRQ\n Input: ucb1400_ts - drop inline annotations\n Input: usb1400_ts - add __devinit/__devexit section annotations\n Input: ucb1400_ts - set driver owner\n Input: ucb1400_ts - convert to use dev_pm_ops\n Input: psmouse - make sure we do not use stale methods\n Input: evdev - do not block waiting for an event if fd is nonblock\n Input: evdev - if no events and non-block, return EAGAIN not 0\n Input: evdev - only allow reading events if a full packet is present\n Input: add driver for pixcir i2c touchscreens\n Input: samsung-keypad - implement runtime power management support\n Input: tegra-kbc - report wakeup key for some platforms\n Input: tegra-kbc - add device tree bindings\n Input: add driver for AUO In-Cell touchscreens using pixcir ICs\n Input: mpu3050 - configure the sampling method\n Input: mpu3050 - ensure we enable interrupts\n Input: mpu3050 - add of_match table for device-tree probing\n Input: sentelic - document the latest hardware\n ...\n\nFix up fairly trivial conflicts (device tree matching conflicting with\nsome independent cleanups) in drivers/input/keyboard/samsung-keypad.c\n" }, { "commit": "269d430131b699c2cadf58495f025a4092959ef5", "tree": "d9972cd7e03f82b6ac59bc471fb59e49dc6fcaab", "parents": [ "d52739c62e0096dccea59f012d80256c6e359a98", "0c437c4ae71c0a8110eb21c06b99853c7056b317" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:20:34 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:20:34 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (40 commits)\n regulator: set constraints.apply_uV to 0 in of_get_fixed_voltage_config\n regulator: max8925: fix enabled/disabled judgement mistake\n regulator: add regulator_bulk_force_disable function\n regulator: pass regulator_register of_node in fixed voltage driver\n regulator: add regulator_force_disable() definition for !CONFIG_REGULATOR\n regulator: Enable supply regulator if child rail is enabled.\n regulator: mc13892: Convert to devm_kzalloc()\n regulator: mc13783: Convert to devm_kzalloc()\n regulator: Fix checking return value of create_regulator\n regulator: Fix the error handling if create_regulator fails\n regulator: Export regulator_is_supported_voltage()\n regulator: mc13892: add device tree probe support\n regulator: mc13892: remove the unnecessary prefix from regulator name\n regulator: Convert wm831x regulator drivers to devm_kzalloc()\n regulator: da9052: Staticize non-exported symbols\n regulator: Replace kzalloc with devm_kzalloc and if-else with a switch-case for da9052-regulator\n regulator: Update da9052-regulator for DT changes\n regulator: DA9052/53 Regulator support\n regulator: pass device_node to of_get_regulator_init_data()\n regulator: If a single voltage is set with device tree then set apply_uV\n ...\n" }, { "commit": "b3c37522928b5452588fc202eaa0f11f6e339256", "tree": "37bfe21d9977b15271903d1a4b304289a232e364", "parents": [ "2ac9d7aaccbd598b5bd19ac40761b723bb675442", "6d0a5636fba5a3f82ec80ab124dd4748344549c3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:39:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:39:59 2012 -0800" }, "message": "Merge tag \u0027pm\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\npower management changes for omap and imx\n\nA significant part of the changes for these two platforms went into\npower management, so they are split out into a separate branch.\n\n* tag \u0027pm\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (65 commits)\n ARM: imx6: remove __CPUINIT annotation from v7_invalidate_l1\n ARM: imx6: fix v7_invalidate_l1 by adding I-Cache invalidation\n ARM: imx6q: resume PL310 only when CACHE_L2X0 defined\n ARM: imx6q: build pm code only when CONFIG_PM selected\n ARM: mx5: use generic irq chip pm interface for pm functions on\n ARM: omap: pass minimal SoC/board data for UART from dt\n arm/dts: Add minimal device tree support for omap2420 and omap2430\n omap-serial: Add minimal device tree support\n omap-serial: Use default clock speed (48Mhz) if not specified\n omap-serial: Get rid of all pdev-\u003eid usage\n ARM: OMAP2+: hwmod: Add a new flag to handle hwmods left enabled at init\n ARM: OMAP4: PRM: use PRCM interrupt handler\n ARM: OMAP3: pm: use prcm chain handler\n ARM: OMAP: hwmod: add support for selecting mpu_irq for each wakeup pad\n ARM: OMAP2+: mux: add support for PAD wakeup interrupts\n ARM: OMAP: PRCM: add suspend prepare / finish support\n ARM: OMAP: PRCM: add support for chain interrupt handler\n ARM: OMAP3/4: PRM: add functions to read pending IRQs, PRM barrier\n ARM: OMAP2+: hwmod: Add API to enable IO ring wakeup\n ARM: OMAP2+: mux: add wakeup-capable hwmod mux entries to dynamic list\n ...\n" }, { "commit": "2ac9d7aaccbd598b5bd19ac40761b723bb675442", "tree": "09132a44e33798aaa5e80f10bf025b510015cab3", "parents": [ "5ede3ceb7b2c2843e153a1803edbdc8c56655950", "dcf7ec5ee62a78123057a1e286c88ca739717409" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:39:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:39:22 2012 -0800" }, "message": "Merge tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nDriver specific changes\n\nAgain, a lot of platforms have changes in here: pxa, samsung, omap,\nat91, imx, ...\n\n* tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)\n ARM: sa1100: clean up of the clock support\n ARM: pxa: add dummy clock for sa1100-rtc\n RTC: sa1100: support sa1100, pxa and mmp soc families\n RTC: sa1100: remove redundant code of setting alarm\n RTC: sa1100: Clean out ost register\n Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()\n pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()\n ARM: EXYNOS: Modified files for SPI consolidation work\n ARM: S5P64X0: Enable SDHCI support\n ARM: S5P64X0: Add lookup of sdhci-s3c clocks using generic names\n ARM: S5P64X0: Add HSMMC setup for host Controller\n ARM: EXYNOS: Add USB OHCI support to ORIGEN board\n USB: Add Samsung Exynos OHCI diver\n ARM: EXYNOS: Add USB OHCI support to SMDKV310 board\n ARM: EXYNOS: Add USB OHCI device\n net: macb: fix build break with !CONFIG_OF\n i2c: tegra: Support DVC controller in device tree\n i2c: tegra: Add __devinit/exit to probe/remove\n net/at91_ether: use gpio_is_valid for phy IRQ line\n ARM: at91/net: add macb ethernet controller in 9g45/9g20 DT\n ...\n" }, { "commit": "6d889d03ab1417645e76e129834f76204bae37c0", "tree": "577e37b5597b27f6de25bbbc634a0f17ccfb15f7", "parents": [ "7400c12eb069df781894a94dfa5c865f3fe3e2d4", "421b759b86eb8a914cbbd11f6d09a74f411762c6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:37:41 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:37:41 2012 -0800" }, "message": "Merge tag \u0027boards\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nBoard-level changes\n\nThis adds and extends support for specific boards on a number of\nARM platforms: omap, imx, samsung, tegra, ...\n\n* tag \u0027boards\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (49 commits)\n Enable 32 bit flash support for iMX21ADS board\n ARM: mx31pdk: Add MC13783 RTC support\n iomux-mx25: configuration to support CSPI3 on CSI pins\n MX1:apf9328: Add i2c support\n mioa701: add newly available DoC G3 chip\n arm/tegra: remove __initdata annotation from pinmux tables\n arm/tegra: Use bus notifiers to trigger pinmux setup\n arm/tegra: Refactor board-*-pinmux.c to share code\n arm/tegra: Fix mistake in Trimslice\u0027s pinmux\n arm/tegra: Rework Seaboard-vs-Ventana pinmux table\n arm/tegra: Remove useless entries from ventana_pinmux[]\n arm/tegra: PCIe: Remove include of mach/pinmux.h\n arm/tegra: Harmony PCIe: Don\u0027t touch pinmux\n arm/tegra: Add AUXDATA for tegra-pinmux and tegra-gpio\n arm/tegra: Split Seaboard GPIO table to allow for Ventana\n ARM: imx6q: generate imx6q dtb files\n arm/imx6q: Rename Sabreauto to Armadillo2\n arm/imx6q-sabrelite: add enet phy ksz9021rn fixup\n arm/imx6: add imx6q sabrelite board support\n dts/imx: rename uart labels to consistent with hw spec\n ...\n" }, { "commit": "dfc1ebe76663d582a01c9dc572395cf8086d01de", "tree": "54a5ac91214a90f82c27b6e38099a4470837729e", "parents": [ "acc952c1f373bf3f66cc7a10680eee1762bed40b", "b001befe58691ef3627458cd814e8cee7f845c5f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:28:38 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:28:38 2012 -0800" }, "message": "Merge tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nDevice tree conversions for samsung and tegra\n\nBoth platforms had some initial device tree support, but this adds\nmuch more to actually make it usable.\n\n* tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (45 commits)\n ARM: dts: Add intial dts file for EXYNOS4210 SoC, SMDKV310 and ORIGEN\n ARM: EXYNOS: Add Exynos4 device tree enabled board file\n rtc: rtc-s3c: Add device tree support\n input: samsung-keypad: Add device tree support\n ARM: S5PV210: Modify platform data for pl330 driver\n ARM: S5PC100: Modify platform data for pl330 driver\n ARM: S5P64x0: Modify platform data for pl330 driver\n ARM: EXYNOS: Add a alias for pdma clocks\n ARM: EXYNOS: Limit usage of pl330 device instance to non-dt build\n ARM: SAMSUNG: Add device tree support for pl330 dma engine wrappers\n DMA: PL330: Add device tree support\n ARM: EXYNOS: Modify platform data for pl330 driver\n DMA: PL330: Infer transfer direction from transfer request instead of platform data\n DMA: PL330: move filter function into driver\n serial: samsung: Fix build for non-Exynos4210 devices\n serial: samsung: add device tree support\n serial: samsung: merge probe() function from all SoC specific extensions\n serial: samsung: merge all SoC specific port reset functions\n ARM: SAMSUNG: register uart clocks to clock lookup list\n serial: samsung: remove all uses of get_clksrc and set_clksrc\n ...\n\nFix up fairly trivial conflicts in arch/arm/mach-s3c2440/clock.c and\ndrivers/tty/serial/Kconfig both due to just adding code close to\nchanges.\n" }, { "commit": "12e55508921865aefdd80fd17afe70c191afbd1b", "tree": "476b3226fd9602b36bed0934409959bdd24a7eb5", "parents": [ "55b81e6f2795484ea8edf5805c95c007cacfa736", "4d447c9a6ebc0142d320f075c5bac6d202a79fd4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:18:17 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:18:17 2012 -0800" }, "message": "Merge branch \u0027staging-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging\n\n* \u0027staging-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (466 commits)\n net/hyperv: Add support for jumbo frame up to 64KB\n net/hyperv: Add NETVSP protocol version negotiation\n net/hyperv: Remove unnecessary kmap_atomic in netvsc driver\n staging/rtl8192e: Register against lib80211\n staging/rtl8192e: Convert to lib80211_crypt_info\n staging/rtl8192e: Convert to lib80211_crypt_data and lib80211_crypt_ops\n staging/rtl8192e: Add lib80211.h to rtllib.h\n staging/mei: add watchdog device registration wrappers\n drm/omap: GEM, deal with cache\n staging: vt6656: int.c, int.h: Change return of function to void\n staging: usbip: removed unused definitions from header\n staging: usbip: removed dead code from receive function\n staging:iio: Drop {mark,unmark}_in_use callbacks\n staging:iio: Drop buffer mark_param_change callback\n staging:iio: Drop the unused buffer enable() and is_enabled() callbacks\n staging:iio: Drop buffer busy flag\n staging:iio: Make sure a device is only opened once at a time\n staging:iio: Disallow modifying buffer size when buffer is enabled\n staging:iio: Disallow changing scan elements in all buffered modes\n staging:iio: Use iio_buffer_enabled instead of open coding it\n ...\n\nFix up conflict in drivers/staging/iio/adc/ad799x_core.c (removal of\nmodule_init due to using module_i2c_driver() helper, next to removal of\nMODULE_ALIAS due to using MODULE_DEVICE_TABLE instead).\n" }, { "commit": "775c32208708de3e2e2379c85e429ab11957f864", "tree": "1b40ad4ce02cdea3ae988c9ce8fe4e14986ec875", "parents": [ "f98872fc14ecb96f796443911b6bc4767e58e885" ], "author": { "name": "Jamie Iles", "email": "jamie@jamieiles.com", "time": "Sun Dec 18 10:00:49 2011 +0000" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Mon Jan 09 18:23:58 2012 +0000" }, "message": "mtd: gpio-nand: add device tree bindings\n\nAdd device tree bindings so that the gpio-nand driver may be\ninstantiated from the device tree. This also allows the partitions\nto be specified in the device tree.\n\nv7:\t- restore runtime device tree/non device tree detection\nv6:\t- convert to mtd_device_parse_register()\nv5:\t- fold dt config helpers into a single gpio_nand_of_get_config()\nv4:\t- get io sync address from gpio-control-nand,io-sync-reg\n\t property rather than a resource\n\t- clarified a few details in the binding\nv3:\t- remove redundant cast and a couple of whitespace/naming\n\t changes\nv2:\t- add CONFIG_OF guards for non-dt platforms\n\t- compatible becomes gpio-control-nand\n\t- clarify some binding details\n\nSigned-off-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@linux.intel.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "421b759b86eb8a914cbbd11f6d09a74f411762c6", "tree": "505ca7f23987d8eaaa519a7e8506b854e2c0d030", "parents": [ "e067096c8d57d191f29d734cd5692695c95cc36e", "a07613a54d700a974f3a4a657da78ef5d097315d" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 17:06:36 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 17:06:36 2012 +0000" }, "message": "Merge branch \u0027samsung/cleanup\u0027 into next/boards\n\nConflicts:\n\tarch/arm/mach-imx/mach-imx6q.c\n\tarch/arm/mach-omap2/board-ti8168evm.c\n\tarch/arm/mach-s3c64xx/Kconfig\n\tarch/arm/mach-tegra/Makefile\n\tarch/arm/mach-tegra/board-dt-tegra20.c\n\tarch/arm/mach-tegra/common.c\n\nLots of relatively simple conflicts between the board\nchanges and stuff from the arm tree. This pulls in\nthe resolution from the samsung/cleanup tree, so we\ndon\u0027t get conflicting merges.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "dcf7ec5ee62a78123057a1e286c88ca739717409", "tree": "fa3f19434638a942ba66d236dde4d9aaadf8b370", "parents": [ "15db3e823c3246e3bd31fe454f5c8927eb85caf2", "142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 16:16:29 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 16:16:29 2012 +0000" }, "message": "Merge branch \u0027samsung/driver\u0027 into next/drivers\n\nConflicts:\n\tarch/arm/mach-mxs/include/mach/common.h\n\nPull in previous samsung conflict merges and do a trivial\nmerge of an mxs double-add conflict.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "5d26dc821ad214906d63bbeda5cdb95ac9798ab0", "tree": "9a38d5fb41a5b3a13c49a42b457bbfca732a8410", "parents": [ "8ad1a973f9a9aad8e170419581a8e98a0f8d1e19" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Wed Dec 21 23:00:44 2011 +0800" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Mon Jan 09 00:37:46 2012 +0100" }, "message": "mfd: Improve mc13xxx dt binding document\n\nIt improves mc13xxx dt binding document on how the regulator name\nis being used for binding a mc13892 regulator device.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nReviewed-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "aeb5032b3f8b9ab69daa545777433fa94b3494c4", "tree": "70a5ec2e43e0ae6c4e7d5793bf79da61c1ac7bf9", "parents": [ "5391b5c645a86d4657c2175acbf21c6461d34849" ], "author": { "name": "Benoit Cousson", "email": "b-cousson@ti.com", "time": "Mon Aug 29 16:20:23 2011 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Mon Jan 09 00:37:40 2012 +0100" }, "message": "mfd: twl-core: Add initial DT support for twl4030/twl6030\n\nAdd initial device-tree support for twl familly chips.\nThe current version is missing the regulator entries due\nto the lack of DT regulator bindings for the moment.\nOnly the simple sub-modules that do not depend on\nplatform_data information can be initialized properly.\n\nAdd irqdomain support.\n\nAdd documentation for the Texas Instruments TWL Integrated Chip.\n\nSigned-off-by: Benoit Cousson \u003cb-cousson@ti.com\u003e\nCc: Balaji T K \u003cbalajitk@ti.com\u003e\nCc: Graeme Gregory \u003cgg@slimlogic.co.uk\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nAcked-by: Rob Herring \u003crob.herring@calxeda.com\u003e\n[grant.likely@secretlab.ca: Fix IRQ_DOMAIN dependency in kconfig]\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "876989d58658858f27a461f0b4b43fa750a208f4", "tree": "6ccd9e3d9cf0c190083a1dcb1d192c91ab616261", "parents": [ "af9081ae64b941d32239b947882cd59ba855c5db" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Mon Dec 12 18:52:57 2011 +0100" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Mon Jan 09 00:37:35 2012 +0100" }, "message": "mfd: Add device tree probe support for mc13xxx\n\nThis adds device tree probe support for mc13xxx mfd driver.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "35ca98423a4c61decc20cd1d1e78a7fd7111e4db", "tree": "0ab46aa8f8201586e6a51a8b68dae7e95bdcee9f", "parents": [ "b46a36c0e0adc92c8be2c8a6fa68d979f6eee124" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Tue Nov 22 18:59:28 2011 +0000" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Mon Jan 09 00:37:30 2012 +0100" }, "message": "mfd: Add basic device tree binding for wm8994\n\nAdd a placeholder device tree binding for the wm8994 driver. At present\nthe binding is essentially null as none of the platform data is supported,\nand at least some of that will depend on the pending regulator bindings.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "b001befe58691ef3627458cd814e8cee7f845c5f", "tree": "1083f1a1cd3feeceeac4b395534df0ff032fdbc8", "parents": [ "31b2a868451d630bacfdeddc626371b3f9d9a01c", "928a11ba36f999436915ea2b1eadf54301f93059" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 12:44:37 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 20:40:51 2012 +0000" }, "message": "Merge branch \u0027samsung/dt\u0027 into next/dt\n\n* samsung/dt: (3 commit)\n Merge branch \u0027depends/rmk/for-linus\u0027 into samsung/dt\n Merge branch \u0027depends/rmk/restart\u0027 into next/cleanup\n Merge branch \u0027next/cleanup\u0027 into samsung/dt\n\nConflicts:\n\tarch/arm/mach-tegra/board-dt.c\n\tarch/arm/mach-tegra/include/mach/entry-macro.S\n\nThe latest version of the samsung/dt branch resolves\nall sorts of conflicts with the latest upstream, no functional\nchanges that are not already there.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "02550d61f49266930e674286379d3601006b2893", "tree": "2d30df688b7f428908028dd20e83b22bc799dee7", "parents": [ "2d51daaa615e4724f24e43fa01e705c40551080a", "c89810acbcf48c7004e912b2b4b862480b2d00e1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:18:52 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:18:52 2012 -0800" }, "message": "Merge tag \u0027devicetree-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\ndevicetree/next changes queued for v3.3 merge window\n\n* tag \u0027devicetree-for-linus-20120104\u0027 of git://git.secretlab.ca/git/linux-2.6:\n ARM: prom.h: Fix build error by removing unneeded header file\n irq: check domain hwirq range for DT translate\n dt: add empty of_get_node/of_put_node functions\n of/pdt: fix section mismatch warning\n i2c-designware: add OF binding support\n dt/i2c: Enumerate some of the known trivial i2c devices\n dt: reform for_each_property to for_each_property_of_node\n ARM/of: allow *machine_desc.dt_compat to be const\n of/base: Take NULL string into account for property with multiple strings\n OF/device-tree: Add some entries to vendor-prefixes.txt\n\nFix up trivial add-add conflicts in include/linux/of.h\n" }, { "commit": "237c78beb8a988453bac1993d21f025d070a0d8d", "tree": "9864f0924650770881141359a2d5bac623949789", "parents": [ "4eb821999086417ab42a15174b51497122fc406e", "7b9dd47136c07ffd883aff6926c7b281e4c1eea4" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 12:30:20 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 12:42:17 2012 +0000" }, "message": "Merge branch \u0027depends/rmk/for-linus\u0027 into samsung/dt\n\nConflicts:\n\tarch/arm/mach-exynos/Makefile\n\tarch/arm/mach-exynos/cpu.c -\u003e common.c\n\tarch/arm/mach-exynos/include/mach/entry-macro.S\n\tarch/arm/mach-exynos/init.c -\u003e common.c\n\tarch/arm/mach-s5p64x0/init.c -\u003e common.c\n\tarch/arm/mach-s5pv210/init.c -\u003e common.c\n\nMultiple files were moved into common.c files in the rmk/for-linus\nbranch, so this moves over the samsung/dt changes to the new\nfiles.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "770e1b035dcb6ec3f8ee69dda0815dd1e220a683", "tree": "e6d36abfdb053fbc722aea8d7e946d6d1b93c7e1", "parents": [ "d3d0b024348c040f0d6851e2e59fc961677d5169", "7b9dd47136c07ffd883aff6926c7b281e4c1eea4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 18:15:25 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 18:15:25 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm\n\n* \u0027for-linus\u0027 of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (207 commits)\n ARM: 7267/1: Remove BUILD_BUG_ON from asm/bug.h\n ARM: 7269/1: mach-sa1100: fix sched_clock breakage\n ARM: 7198/1: arm/imx6: add restart support for imx6q\n ARM: restart: remove the now empty arch_reset()\n ARM: restart: remove comments about adding code to arch_reset()\n ARM: restart: lpc32xx \u0026 u300: remove unnecessary printk\n ARM: restart: plat-samsung: remove plat/reset.h and s5p_reset_hook\n ARM: restart: w90x900: use new restart hook\n ARM: restart: Versatile Express: use new restart hook\n ARM: restart: versatile: use new restart hook\n ARM: restart: u300: use new restart hook\n ARM: restart: tegra: use new restart hook\n ARM: restart: spear: use new restart hook\n ARM: restart: shark: use new restart hook\n ARM: restart: sa1100: use new restart hook\n ARM: 7252/1: restart: S5PV210: use new restart hook\n ARM: 7251/1: restart: S5PC100: use new restart hook\n ARM: 7250/1: restart: S5P64X0: use new restart hook\n ARM: 7266/1: restart: S3C64XX: use new restart hook\n ARM: 7265/1: restart: S3C24XX: use new restart hook\n ...\n\nFix up trivial conflict in arch/arm/mm/init.c due to removal of\nmemblock_init() clashing with the movement of the sorting of the meminfo\narray.\n" }, { "commit": "e4e88f31bcb5f05f24b9ae518d4ecb44e1a7774d", "tree": "9eef6998f5bbd1a2c999011d9e0151f00c6e7297", "parents": [ "9753dfe19a85e7e45a34a56f4cb2048bb4f50e27", "ef88e3911c0e0301e73fa3b3b2567aabdbe17cc4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:58:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:58:22 2012 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (185 commits)\n powerpc: fix compile error with 85xx/p1010rdb.c\n powerpc: fix compile error with 85xx/p1023_rds.c\n powerpc/fsl: add MSI support for the Freescale hypervisor\n arch/powerpc/sysdev/fsl_rmu.c: introduce missing kfree\n powerpc/fsl: Add support for Integrated Flash Controller\n powerpc/fsl: update compatiable on fsl 16550 uart nodes\n powerpc/85xx: fix PCI and localbus properties in p1022ds.dts\n powerpc/85xx: re-enable ePAPR byte channel driver in corenet32_smp_defconfig\n powerpc/fsl: Update defconfigs to enable some standard FSL HW features\n powerpc: Add TBI PHY node to first MDIO bus\n sbc834x: put full compat string in board match check\n powerpc/fsl-pci: Allow 64-bit PCIe devices to DMA to any memory address\n powerpc: Fix unpaired probe_hcall_entry and probe_hcall_exit\n offb: Fix setting of the pseudo-palette for \u003e8bpp\n offb: Add palette hack for qemu \"standard vga\" framebuffer\n offb: Fix bug in calculating requested vram size\n powerpc/boot: Change the WARN to INFO for boot wrapper overlap message\n powerpc/44x: Fix build error on currituck platform\n powerpc/boot: Change the load address for the wrapper to fit the kernel\n powerpc/44x: Enable CRASH_DUMP for 440x\n ...\n\nFix up a trivial conflict in arch/powerpc/include/asm/cputime.h due to\nthe additional sparse-checking code for cputime_t.\n" }, { "commit": "e067096c8d57d191f29d734cd5692695c95cc36e", "tree": "e1c200404c3ed3730d04837113d59ca898eb483a", "parents": [ "1fc3eb81100c3f3cd44e706e54390151b0f1ce74", "e5570bbc9c06634cfac94e06ac1432b53d8595e5" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jan 06 23:09:14 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jan 06 23:09:14 2012 +0000" }, "message": "Merge branch \u0027tegra/soc\u0027 into next/boards\n\nConflicts:\n\tarch/arm/mach-tegra/board-harmony-pcie.c\n\nTo fix an internal merge conflict between the tegra/soc and tegra/boards\nbranches.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "e57f1b68c4066459ed9e49177cdcefa6973ce9d2", "tree": "630fe21c4bb8fc46e49240eec863dcb5ed35f312", "parents": [ "1c84b60b813cb10476618b2311a89e31018b2cc4" ], "author": { "name": "Rhyland Klein", "email": "rklein@nvidia.com", "time": "Mon Dec 05 17:50:48 2011 -0800" }, "committer": { "name": "Anton Vorontsov", "email": "cbouatmailru@gmail.com", "time": "Fri Jan 06 05:25:53 2012 +0400" }, "message": "devicetree-bindings: Propagate bq20z75-\u003esbs rename to dt bindings\n\nSigned-off-by: Rhyland Klein \u003crklein@nvidia.com\u003e\nSigned-off-by: Anton Vorontsov \u003ccbouatmailru@gmail.com\u003e\n" }, { "commit": "1c84b60b813cb10476618b2311a89e31018b2cc4", "tree": "516bcec7bce1a2644e2e13de7a7c892e085307bc", "parents": [ "3ddca062f8d71724529b0d52609994c9886f1a18" ], "author": { "name": "Rhyland Klein", "email": "rklein@nvidia.com", "time": "Mon Dec 05 17:50:47 2011 -0800" }, "committer": { "name": "Anton Vorontsov", "email": "cbouatmailru@gmail.com", "time": "Fri Jan 06 05:25:31 2012 +0400" }, "message": "devicetree-bindings: Add vendor entry for Smart Battery Systems\n\nSigned-off-by: Rhyland Klein \u003crklein@nvidia.com\u003e\nSigned-off-by: Anton Vorontsov \u003ccbouatmailru@gmail.com\u003e\n" }, { "commit": "661db794eb8179c7bea02f159bb691a2fff4a8e0", "tree": "810f4b85c9089c3fd51dcb1d1f9b872c62972f6c", "parents": [ "35f3da32af0e8970cc41288d4a7e3bd32399900e" ], "author": { "name": "Benoit Cousson", "email": "b-cousson@ti.com", "time": "Mon Dec 05 15:23:56 2011 +0100" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Jan 04 00:33:15 2012 -0700" }, "message": "of/irq: Add interrupts-names property to name an irq resource\n\nAdd a interrupts-names property to allow the possibility to provide a name\nto any interrupts entries. If the name is available, use it to name the\nresource, otherwise keep the device full name.\n\nSigned-off-by: Benoit Cousson \u003cb-cousson@ti.com\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: Rob Herring \u003crob.herring@calxeda.com\u003e\n[grant.likely: use \"interrupt-names\" and tidy documentation]\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "35f3da32af0e8970cc41288d4a7e3bd32399900e", "tree": "67390af46cf0fff8f65e31ac3b07e553cfc2fa16", "parents": [ "93797d87d63d36404907640e4e20bb976bff4744" ], "author": { "name": "Benoit Cousson", "email": "b-cousson@ti.com", "time": "Mon Dec 05 15:23:55 2011 +0100" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Jan 04 00:27:22 2012 -0700" }, "message": "of/address: Add reg-names property to name an iomem resource\n\nAdd a reg-names property to allow for reg regions to be reference by name\ninstead of by index. Some devices have multiple register regions which\nare more naturally referenced by name.\n\nIf the name is available, use it to name the resource when creating a devices.\nOtherwise keep the device name.\n\nSigned-off-by: Benoit Cousson \u003cb-cousson@ti.com\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: Rob Herring \u003crob.herring@calxeda.com\u003e\n[Generalized documentation to be for any -names property]\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "251f39fe42dae863bd24e30864e6b66076ba076d", "tree": "c804944bc17f3836d19cc8b5bc611dd1fb0ea915", "parents": [ "9b8872273af6983b246252a6508fa7cf34c69d6e", "35b4c01e29bdd9632dabf9784ed3486333f00427" ], "author": { "name": "Anton Vorontsov", "email": "cbouatmailru@gmail.com", "time": "Wed Jan 04 09:09:35 2012 +0400" }, "committer": { "name": "Anton Vorontsov", "email": "cbouatmailru@gmail.com", "time": "Wed Jan 04 09:09:35 2012 +0400" }, "message": "Merge branch \u0027power-supply-scope\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen\n" }, { "commit": "a445c7f0afb9114ef3de2d123f2c851787cf9d11", "tree": "554783015eee8cc895ee73ca0f5137ab0984f9b3", "parents": [ "5245db49d44e6033fece4d9f5946f8970c0d9ca1" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Dec 29 09:58:16 2011 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Fri Dec 30 00:26:00 2011 -0800" }, "message": "Input: tegra-kbc - add device tree bindings\n\nThis adds a simple device tree binding to the tegra keyboard controller.\n\nAlso, mark the default keymap as __devinitdata since it is not referenced\nafter boot.\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "bd4b9ba4cf9338932a065cd752fb5f28b26e4e39", "tree": "88725708d3f2696f1c2373cf62d0b997c207e861", "parents": [ "e814fb635cd269532a6a95a921c05841ababa7ae", "8a44930a11de8d66f92145fd2d2464ab4fba696b" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Dec 28 00:18:10 2011 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Dec 28 00:18:10 2011 +0000" }, "message": "Merge branch \u0027samsung/cleanup\u0027 into next/drivers\n\nDependency for the samsung/drivers branch\n\nConflicts:\n\tarch/arm/mach-exynos/Makefile\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "31b2a868451d630bacfdeddc626371b3f9d9a01c", "tree": "b8823382f687c34dd8c180abcfb85eed34d701e6", "parents": [ "9cad9a5ff61abeddc2acb22aace9245f39b98f72", "4eb821999086417ab42a15174b51497122fc406e" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Dec 27 23:21:28 2011 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Dec 27 23:21:28 2011 +0000" }, "message": "Merge branch \u0027samsung/dt\u0027 into next/dt\n\n* samsung/dt: (27 commits)\n ARM: dts: Add intial dts file for EXYNOS4210 SoC, SMDKV310 and ORIGEN\n ARM: EXYNOS: Add Exynos4 device tree enabled board file\n rtc: rtc-s3c: Add device tree support\n input: samsung-keypad: Add device tree support\n ARM: S5PV210: Modify platform data for pl330 driver\n ARM: S5PC100: Modify platform data for pl330 driver\n ARM: S5P64x0: Modify platform data for pl330 driver\n ARM: EXYNOS: Add a alias for pdma clocks\n ARM: EXYNOS: Limit usage of pl330 device instance to non-dt build\n ARM: SAMSUNG: Add device tree support for pl330 dma engine wrappers\n DMA: PL330: Add device tree support\n ARM: EXYNOS: Modify platform data for pl330 driver\n DMA: PL330: Infer transfer direction from transfer request instead of platform data\n DMA: PL330: move filter function into driver\n serial: samsung: Fix build for non-Exynos4210 devices\n serial: samsung: add device tree support\n serial: samsung: merge probe() function from all SoC specific extensions\n serial: samsung: merge all SoC specific port reset functions\n ARM: SAMSUNG: register uart clocks to clock lookup list\n serial: samsung: remove all uses of get_clksrc and set_clksrc\n ...\n" }, { "commit": "af71100c7acf3ccaf95044cd5e9e866178e5f8a1", "tree": "c32418dff60d957bd44ecc20cf91d4c2ff088e38", "parents": [ "02bca5ff270774d4b4929de8b62ab96708065386" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Tue Nov 08 14:43:47 2011 -0600" }, "committer": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Tue Dec 27 15:52:44 2011 -0600" }, "message": "i2c-designware: add OF binding support\n\nAdd of_match_table and DT style i2c registration to designware i2c\ndriver.\n\nRefactored for pci/plat split by Dirk Brandewie.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Dirk Brandewie \u003cdirk.brandewie@gmail.com\u003e\n" }, { "commit": "02bca5ff270774d4b4929de8b62ab96708065386", "tree": "34c5b17d9fb91fcab45b78ea9b8090a33aa84ec1", "parents": [ "8af0da93da7c40526959ab5291964581c678d3e7" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Dec 27 11:18:46 2011 -0800" }, "committer": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Tue Dec 27 15:42:26 2011 -0600" }, "message": "dt/i2c: Enumerate some of the known trivial i2c devices\n\nBased on recent discussions, we apparently want to do bindings even for\ntrivial i2c devices, even though they have for years just been added. So\nstart a table of the currently known ones for others to be added to\nover time.\n\n(I am intentionally letting lines go over 80 characters to make it easier\nto sort the file).\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\n" }, { "commit": "6b5ab4f442e32f248b6fad29aafd1d5153f4dbd3", "tree": "861907fb4f375867118f5f38acbf13fed97d59c9", "parents": [ "39ce4084a604a3ef0e2836e074c02bbbcc7c1509" ], "author": { "name": "Thomas Abraham", "email": "thomas.abraham@linaro.org", "time": "Sun Nov 06 21:54:27 2011 +0530" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Fri Dec 23 10:07:11 2011 +0900" }, "message": "ARM: EXYNOS: Add Exynos4 device tree enabled board file\n\nAdd a new EXYNOS4 compatible device tree enabled board file. Boards\nbased on the EXYNOS4 family of SoC\u0027s can use this as the machine/board\nfile. When using this machine fike, a corresponding device tree blob\nwhich describes the board\u0027s properties should be supplied at boot time\nto the kernel.\n\nSigned-off-by: Thomas Abraham \u003cthomas.abraham@linaro.org\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "39ce4084a604a3ef0e2836e074c02bbbcc7c1509", "tree": "bb66668c9b87406fa248bf7ff26a08368634dad5", "parents": [ "b3d6ac3e5f937440a362c0fa187257fa1197f5b9" ], "author": { "name": "Thomas Abraham", "email": "thomas.abraham@linaro.org", "time": "Mon Oct 24 14:49:04 2011 +0200" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Fri Dec 23 10:07:10 2011 +0900" }, "message": "rtc: rtc-s3c: Add device tree support\n\nAdd device tree based discovery support for Samsung\u0027s rtc controller.\n\nCc: Ben Dooks \u003cben-linux@fluff.org\u003e\nSigned-off-by: Thomas Abraham \u003cthomas.abraham@linaro.org\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "b3d6ac3e5f937440a362c0fa187257fa1197f5b9", "tree": "f9d535987acc864a3948174e893077b5f6543138", "parents": [ "8742e0441d6530d40d85d65a6bcc5a6c0c4eab13" ], "author": { "name": "Thomas Abraham", "email": "thomas.abraham@linaro.org", "time": "Wed Nov 02 19:37:22 2011 +0900" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Fri Dec 23 10:07:10 2011 +0900" }, "message": "input: samsung-keypad: Add device tree support\n\nAdd device tree based discovery support for Samsung\u0027s keypad controller.\n\nCc: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nCc: Donghwa Lee \u003cdh09.lee@samsung.com\u003e\nSigned-off-by: Thomas Abraham \u003cthomas.abraham@linaro.org\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "93ed55441245a39e3935f5cf1af3e22febcce905", "tree": "5e238c5e269274fd47c1d03cb0a1c6172feef8fc", "parents": [ "e1cd8454dac99473c2349efce1346264c494f28d" ], "author": { "name": "Thomas Abraham", "email": "thomas.abraham@linaro.org", "time": "Mon Oct 24 11:43:31 2011 +0200" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Fri Dec 23 10:07:04 2011 +0900" }, "message": "DMA: PL330: Add device tree support\n\nFor PL330 dma controllers instantiated from device tree, the channel\nlookup is based on phandle of the dma controller and dma request id\nspecified by the client node. During probe, the private data of each\nchannel of the controller is set to point to the device node of the\ndma controller. The \u0027chan_id\u0027 of the each channel is used as the\ndma request id.\n\nClient driver requesting dma channels specify the phandle of the\ndma controller and the request id. The pl330 filter function\nconverts the phandle to the device node pointer and matches that\nwith channel\u0027s private data. If a match is found, the request id\nfrom the client node and the \u0027chan_id\u0027 of the channel is matched.\nA channel is found if both the values match.\n\nAcked-by: Jassi Brar \u003cjassisinghbrar@gmail.com\u003e\nAcked-by: Boojin Kim \u003cboojin.kim@samsung.com\u003e\nSigned-off-by: Thomas Abraham \u003cthomas.abraham@linaro.org\u003e\nReviewed-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "26c919e1d3f4dff87ad50e104670f048cbc69b17", "tree": "7ad7222cb616409257e414b403e9b5ea2c488a07", "parents": [ "da121506eb03ee5daea55404709110b798bd61d9" ], "author": { "name": "Thomas Abraham", "email": "thomas.abraham@linaro.org", "time": "Sun Nov 06 22:10:44 2011 +0530" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Fri Dec 23 10:07:01 2011 +0900" }, "message": "serial: samsung: add device tree support\n\nAdd device tree based discovery support for Samsung\u0027s uart controller.\n\nCc: Ben Dooks \u003cben-linux@fluff.org\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Thomas Abraham \u003cthomas.abraham@linaro.org\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "659d73ada5d6869dc18838c9125731a750389019", "tree": "1c46b7ee38c09391942f8ded59a16614e166499c", "parents": [ "f983575aa90ceeb2cc7923223882dcf1debf5aa2" ], "author": { "name": "Thomas Abraham", "email": "thomas.abraham@linaro.org", "time": "Mon Nov 07 01:02:21 2011 +0530" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Fri Dec 23 10:06:54 2011 +0900" }, "message": "gpio/samsung: Add device tree support for EXYNOS4\n\nAs gpio chips get registered, a device tree node which represents the\ngpio chip is searched and attached to it. A translate function is also\nprovided to convert the gpio specifier into actual platform settings\nfor pin function selection, pull up/down and driver strength settings.\n\nSigned-off-by: Thomas Abraham \u003cthomas.abraham@linaro.org\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n[kgene.kim@samsung.com: fixed build error]\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "07cdf36d8c4ba4ad0db13228eb25bcd3d5138b29", "tree": "3a108122b2dd986b0c840d1456c7080af2f97cc3", "parents": [ "a4a54dd5bb1bb01010f46147d6d8b452255957bf" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Mon Dec 12 15:55:36 2011 -0700" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Tue Dec 20 01:05:34 2011 +0000" }, "message": "ASoC: Tegra+WM8903 machine: Add device tree binding\n\nThis driver is parameterized in two ways:\n\na) Platform data, which supplies the set of GPIOs used by the driver.\n These GPIOs can now be parsed out of device tree.\n\nb) Machine-specific DAPM route arrays embedded into the ASoC machine\n driver itself. Historically, the driver picks the appropriate array\n to use using machine_is_*(). The driver now requires this array to\n be parsed from device tree when instantiated through device tree,\n using the core ASoC support for this parsing.\n\nBased on work by John Bonesio, but significantly reworked since then.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "44ad56b7df54cbc8063b46883d183e4e2f09f831", "tree": "565a44f209f702330688e636157e91ed5c71a396", "parents": [ "384703b8e6cd4c8ef08512e596024e028c91c339" ], "author": { "name": "David Daney", "email": "david.daney@cavium.com", "time": "Wed Dec 14 15:26:19 2011 -0800" }, "committer": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Mon Dec 19 15:39:46 2011 -0600" }, "message": "OF/device-tree: Add some entries to vendor-prefixes.txt\n\nWe are currently using \u0027cavium\u0027, \u0027cortina\u0027 and \u0027st\u0027, add them to the\nlist of known prefixes.\n\nSigned-off-by: David Daney \u003cdavid.daney@cavium.com\u003e\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\n" }, { "commit": "d695cfa54e9ec48aeb149cadc8dab1240751572a", "tree": "503d342f303181c4a8e4fb89e070117d5760c513", "parents": [ "c3e00a0eff4c05717915ac7a8e4646db3882aebf", "3bdc3484e8f2b1b219ad0397d81ce4601fbaf76d" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sat Dec 17 20:05:50 2011 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sat Dec 17 20:05:50 2011 -0800" }, "message": "Merge remote-tracking branch \u0027rmk/devel-stable\u0027 into for-3.3/soc\n\nConflicts:\n\tarch/arm/mach-tegra/board-dt.c\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "c3e00a0eff4c05717915ac7a8e4646db3882aebf", "tree": "f988462b879fb5e83849a1df4827d2d0740e256a", "parents": [ "0d4f74792e2946cb2ef40a1673851eda1041358c" ], "author": { "name": "Peter De Schrijver", "email": "pdeschrijver@nvidia.com", "time": "Wed Dec 14 17:03:13 2011 +0200" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sat Dec 17 16:14:49 2011 -0800" }, "message": "arm/tegra: initial device tree for tegra30\n\nThis patch adds the initial device tree for tegra30\n\nSigned-off-by: Peter De Schrijver \u003cpdeschrijver@nvidia.com\u003e\nAcked-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nAcked-by: Colin Cross \u003cccross@android.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "578bd83d7e2bbf533c6968291abb36850c6eaff8", "tree": "ed9643d02f34d28036f4fc07d2211ad0b91219cb", "parents": [ "58c017750dc00793cf9ee292a5ce4df1748e852f", "1bccc8077f4ddbd64d7d085501baa2543182f29e" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Dec 16 14:51:24 2011 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Dec 16 14:51:24 2011 -0800" }, "message": "Merge branch \u0027imx6/boards\u0027 into next/boards\n\n* imx6/boards:\n ARM: imx6q: generate imx6q dtb files\n arm/imx6q: Rename Sabreauto to Armadillo2\n arm/imx6q-sabrelite: add enet phy ksz9021rn fixup\n arm/imx6: add imx6q sabrelite board support\n dts/imx: rename uart labels to consistent with hw spec\n dts/imx: rename gpio labels to consistent with hw spec\n" }, { "commit": "d92b0dfc5078aeec869d58372dbda5e16739b8de", "tree": "2f8d3c57855e0c567e533286ad7653e873ec2af9", "parents": [ "8fe789dc375a1929bf64a9b982140cf394c8bce5" ], "author": { "name": "Rajendra Nayak", "email": "rnayak@ti.com", "time": "Wed Dec 14 17:25:45 2011 +0530" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Fri Dec 16 14:11:06 2011 -0800" }, "message": "omap-serial: Add minimal device tree support\n\nAdapt the driver to device tree and pass minimal platform\ndata from device tree needed for console boot.\nNo power management features will be suppported for now\nsince it requires more tweaks around OCP settings\nto toggle forceidle/noidle/smartidle bits and handling\nremote wakeup and dynamic muxing.\n\nSigned-off-by: Rajendra Nayak \u003crnayak@ti.com\u003e\nReviewed-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "06d123e0984424505eedd09981f1bafc3c38de78", "tree": "4aa75853378becf583d9514f068045056f45c367", "parents": [ "4966eba037bd0841cdb458907f27b71d4dcfd5d4", "2839038bb1a72ed7ef3c39521e0ca981c9cb1534" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Dec 16 14:32:28 2011 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Dec 16 14:32:28 2011 +0000" }, "message": "Merge branch \u0027at91/macb\u0027 into next/drivers\n" }, { "commit": "fb97a8466522f8f35ab886f7af8eefefa0a4905e", "tree": "a209f86f003cf9aeec88cecb9f1bf8e8a79b19e6", "parents": [ "0116da4fcc1ae8a80d9002441e98768f2a6fa2fe" ], "author": { "name": "Jean-Christophe PLAGNIOL-VILLARD", "email": "plagnioj@jcrosoft.com", "time": "Fri Nov 18 15:29:25 2011 +0100" }, "committer": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Fri Dec 16 13:11:00 2011 +0100" }, "message": "net/macb: add DT support for Cadence macb/gem driver\n\nAllow the device tree to provide the mac address and the phy mode.\n\nSigned-off-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\n[nicolas.ferre@atmel.com: change \"compatible\" node property, doc and DT hwaddr]\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\n[jamie@jamieiles.com: add \"gem\" compatibility strings and doc]\nAcked-by: Jamie Iles\u003cjamie@jamieiles.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "752baf5647d40dc67dc1b74125fa693ac2137563", "tree": "6cbd3f3018e305344f2a101f8be2b6ad1db1093c", "parents": [ "477fce49aef4096639ca169556435c1f9068ce33" ], "author": { "name": "Dirk Behme", "email": "dirk.behme@de.bosch.com", "time": "Thu Dec 08 08:22:01 2011 +0100" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Wed Dec 14 21:25:46 2011 +0800" }, "message": "arm/imx6q: Rename Sabreauto to Armadillo2\n\nThe Sabreauto board was renamed to Armadillo2 recently. To avoid\nconfusion, rename Sabreauto to Armadillo2/arm2.\n\nSigned-off-by: Dirk Behme \u003cdirk.behme@de.bosch.com\u003e\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\n" }, { "commit": "3c8276c6bc912025db50ff7e93af6bc7c3de0c8c", "tree": "f3604c8204787e2cc8cd1fba2f743f8d40d27388", "parents": [ "8f9ffecfa9c6d4d813e6fa9f20f549b01f8d070e" ], "author": { "name": "Richard Zhao", "email": "richard.zhao@linaro.org", "time": "Wed Dec 14 09:26:46 2011 +0800" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Wed Dec 14 21:25:45 2011 +0800" }, "message": "arm/imx6: add imx6q sabrelite board support\n\n- Add basic board dts file\n- Add board compatible string to mach-imx6q.\n- Update fsl DT board doc.\n\nSigned-off-by: Richard Zhao \u003crichard.zhao@linaro.org\u003e\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\n" }, { "commit": "68556ca1e03d6a35be3b315eba58df2f8176e3a0", "tree": "36a390d29a0d03a59a90c0f223b0d98a80f0f6c3", "parents": [ "0604ca48f1689ad06144b81f5c08f297b6edd831", "8ab30691826fc05efa47c4ffba19b80496bb3a2c" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Tue Dec 13 00:19:20 2011 +0800" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Tue Dec 13 00:19:20 2011 +0800" }, "message": "Merge branch \u0027mfd/wm8994\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc into for-3.3\n" }, { "commit": "cf763c2e606e9e427ed854c470911e816be1101e", "tree": "23ae34e97b36dd60594721da489a5308c9f14ade", "parents": [ "583cca6e2b1c4bc70dab49d030fc4f795cba5cfe" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Tue Nov 22 18:22:29 2011 +0000" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Tue Dec 13 00:09:11 2011 +0800" }, "message": "mfd: Add basic device tree binding for wm8994\n\nAdd a placeholder device tree binding for the wm8994 driver. At present\nthe binding is essentially null as none of the platform data is supported,\nand at least some of that will depend on the pending regulator bindings.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nAcked-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "407f3fd8faf80f77c47ebda7501c6a8698d2f3a6", "tree": "3b41623f7174f1bee5b31853d2b295028cf9e376", "parents": [ "dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50", "1d06825b0ede541f63b5577435abd2fc649a9b5e" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 09 19:01:27 2011 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 09 19:01:27 2011 -0800" }, "message": "Merge 3.2-rc5 into staging-next\n\nThis resolves the conflict in the\ndrivers/staging/iio/industrialio-core.c file due to two different\nchanges made to resolve the same problem.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "c27317c0ed114152d02b2ed40056f232e5732b9d", "tree": "8f56d4f70187e4314454c4c9fe9132f581fd2df4", "parents": [ "317d5330aea392c032a5f8c87df74444fd514910" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Nov 04 09:12:39 2011 +0000" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Dec 07 20:47:47 2011 -0800" }, "message": "arm/dt: add basic usb nodes to tegra device trees\n\nFor now they are a minimal binding. It needs to be amended with\nvendor-specific settings for phy setup and link tuning, etc.\n\nv2: Added bindings specification and phy_type properties\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Stephen Warren \u003cswarren@nvidia.com\u003e\n" }, { "commit": "5d680b3a84b3e870fc1ea01495935e58e17de7aa", "tree": "796dd0a7d6310f366cd123389294acf467516d21", "parents": [ "9d35f3e100eb5cfb91d777c8621fb585ad0327cd" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Fri Dec 02 15:08:41 2011 -0700" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Tue Dec 06 10:29:22 2011 +0000" }, "message": "ASoC: WM8903: Add device tree binding\n\nDocument the device tree binding for the WM8903 codec, and modify the\ndriver to extract platform data from the device tree, if present.\n\nBased on work by John Bonesio, but significantly reworked since then.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "742eaa6a6e356a16788ce6530271de89bc4f8fb5", "tree": "12fc040daab06ac796c61c1d92bfad9bb054d1c1", "parents": [ "ba8bb18a03f8c7508565c385576a5431a4ad804a", "ae72fd588a2b302222769b44775912b83f0785eb" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Dec 05 23:20:17 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Dec 05 23:20:17 2011 +0000" }, "message": "Merge branch \u0027for-rmk\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable\n\nConflicts:\n\tarch/arm/common/gic.c\n\tarch/arm/plat-omap/include/plat/common.h\n" }, { "commit": "b3613118eb30a589d971e4eccbbb2a1314f5dfd4", "tree": "868c1ee59e1b5c19a4f2e43716400d0001a994e5", "parents": [ "7505afe28c16a8d386624930a018d0052c75d687", "5983fe2b29df5885880d7fa3b91aca306c7564ef" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 02 13:49:21 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 02 13:49:21 2011 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "e285e44d91fe5a89e0d9fe4f5dda4f9e8c8a3c7e", "tree": "71cb2e9689c289a533a63f0fb6e732988dc92b57", "parents": [ "edd2c26ffb7742bf0d3bd324694d220281844a01" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Wed Nov 30 23:41:20 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 01 13:09:31 2011 -0500" }, "message": "can: cc770: add platform bus driver for the CC770 and AN82527\n\nThis driver works with both, static platform data and device tree\nbindings. It has been tested on a TQM855L board with two AN82527\nCAN controllers on the local bus.\n\nCC: Devicetree-discuss@lists.ozlabs.org\nCC: linuxppc-dev@ozlabs.org\nCC: Kumar Gala \u003cgalak@kernel.crashing.org\u003e\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nAcked-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bf55499e6ee927e047feed85349365481289bd75", "tree": "1a66f9005fffdeb8669c7af55375cd91b9a01a75", "parents": [ "b00adf76a6fa492c39f8225fc42debc01bbbdc1d" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Tue Nov 29 18:36:48 2011 -0700" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Wed Nov 30 09:38:13 2011 +0000" }, "message": "ASoC: Tegra I2S: Add device tree binding\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "e43fce14088d9910b545c30c9a7127deb289d477", "tree": "0b6c3ca6bd479dceba201185bc76fac6ab37a692", "parents": [ "d7fb6d0adb86ed1c5290e754092a5a1e3de76ee9" ], "author": { "name": "Pawel Moll", "email": "pawel.moll@arm.com", "time": "Tue Nov 08 11:35:20 2011 +0000" }, "committer": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Tue Nov 29 08:24:20 2011 -0600" }, "message": "of: Add Silicon Image vendor prefix\n\n\"sil\" is the most commonly used abbreviation for Silicon\nImage products.\n\nSigned-off-by: Pawel Moll \u003cpawel.moll@arm.com\u003e\n" }, { "commit": "85c10f28286148ee5cdba1d22c81936ff160596e", "tree": "f2dba1bd0a281e8fc56e080a449ba7b8b6a810b9", "parents": [ "8ac72d167198f52cba8637cc9bec89339b8e4e64" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Tue Nov 22 17:18:19 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 29 01:15:24 2011 -0500" }, "message": "net: add calxeda xgmac ethernet driver\n\nAdd support for the XGMAC 10Gb ethernet device in the Calxeda Highbank\nSOC.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7728c14a785f934ffccc4f45ecd9646fc07ea679", "tree": "139ad8c4ece52e75b623c8fa1e13de2bb7d271b6", "parents": [ "22d881c068403c155fbe320c0a26e3b1bcdaa1b8" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Mon Nov 28 21:37:16 2011 +0800" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Mon Nov 28 19:00:05 2011 +0000" }, "message": "regulator: fix label names used in device tree bindings\n\nDevice tree compiler does not recognize \u0027-\u0027 in label name. Instead,\n\u0027_\u0027 works fine.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "7990b0d7ec449b10da383bab191eb487185aadce", "tree": "298fec26991b33ad9fb1a7e4fc7dbf56d0994551", "parents": [ "d9f26a6689a3e4ae643fca9c2acda3148b717e63" ], "author": { "name": "Marc Dietrich", "email": "marvin24@gmx.de", "time": "Tue Nov 01 21:37:04 2011 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Sat Nov 26 17:17:14 2011 -0800" }, "message": "staging: nvec: add device tree support\n\nThis adds device tree support to the nvec driver. By using this method\nit is no longer necessary to specify platform data through a board\nfile.\n\nSigned-off-by: Marc Dietrich \u003cmarvin24@gmx.de\u003e\nAcked-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nCc: Julian Andres Klode \u003cjak@jak-linux.org\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Olof Johansson \u003colof@lixom.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "6c75ea1e582d12120072cae742a0d63ea8ac8c65", "tree": "e7d83460d58069ba6e3e664408a03a69db2ccaf9", "parents": [ "85b5fbf784810d80aa09646189848c9ebc8a4ba2" ], "author": { "name": "Rhyland Klein", "email": "rklein@nvidia.com", "time": "Wed Sep 14 13:19:07 2011 -0700" }, "committer": { "name": "Anton Vorontsov", "email": "cbouatmailru@gmail.com", "time": "Thu Nov 24 22:39:17 2011 +0400" }, "message": "bq20z75: Devicetree init support\n\nAdding support to generate platform data when kernel is configured\nthrough device tree.\n\nAlso adding the binding for the TI bq20z75 fuel gadge and the\nbq20z75 driver.\n\nSigned-off-by: Rhyland Klein \u003crklein@nvidia.com\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Anton Vorontsov \u003ccbouatmailru@gmail.com\u003e\n" }, { "commit": "91610d830dbc90ebf01fd255873d8277bf72d040", "tree": "633bf9bb4fd7f21ee904d4b032c716152faa1ab4", "parents": [ "e3854b6e25d1b092c30c5f81a04fe6fc839b1e26" ], "author": { "name": "Liu Gang", "email": "Gang.Liu@freescale.com", "time": "Sat Nov 12 20:02:32 2011 +0800" }, "committer": { "name": "Kumar Gala", "email": "galak@kernel.crashing.org", "time": "Thu Nov 24 02:01:34 2011 -0600" }, "message": "powerpc/fsl: Document rapidio node binding-information\n\nThis document is created for powerpc rapidio and rmu nodes in dts file.\nThese nodes can support two rapidio ports and message units. In addition,\nIt explicates the properties and gives examples about rapidio and rmu nodes.\n\nSigned-off-by: Li Yang \u003cleoli@freescale.com\u003e\nSigned-off-by: Jin Qing \u003cb24347@freescale.com\u003e\nSigned-off-by: Liu Gang \u003cGang.Liu@freescale.com\u003e\nAcked-by: Alexandre Bounine \u003calexandre.bounine@idt.com\u003e\nSigned-off-by: Kumar Gala \u003cgalak@kernel.crashing.org\u003e\n" }, { "commit": "cef49102c1d6b1e7adcb3f8b706757e0731e955c", "tree": "b0768529f9f01b44c10bcf1f6c431d708870a72a", "parents": [ "8f446e6fa1d506be2cb80f91c214f1705327c7f9" ], "author": { "name": "Rajendra Nayak", "email": "rnayak@ti.com", "time": "Fri Nov 18 16:47:18 2011 +0530" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Wed Nov 23 18:47:00 2011 +0000" }, "message": "regulator: adapt fixed regulator driver to dt\n\nThe fixed regulator driver uses of_get_fixed_voltage_config()\nto extract fixed_voltage_config structure contents from device tree.\n\nAlso add documenation for additional bindings for fixed\nregulators that can be passed through dt.\n\nSigned-off-by: Rajendra Nayak \u003crnayak@ti.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "8f446e6fa1d506be2cb80f91c214f1705327c7f9", "tree": "e0c87fe06aceaf333311f57bf831a027188666b3", "parents": [ "cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37" ], "author": { "name": "Rajendra Nayak", "email": "rnayak@ti.com", "time": "Fri Nov 18 16:47:17 2011 +0530" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Wed Nov 23 18:46:55 2011 +0000" }, "message": "regulator: helper routine to extract regulator_init_data\n\nThe helper routine is meant to be used by the regulator drivers\nto extract the regulator_init_data structure from the data\nthat is passed from device tree.\n\u0027consumer_supplies\u0027 which is part of regulator_init_data is not extracted\nas the regulator consumer mappings are passed through DT differently,\nimplemented in subsequent patches.\nSimilarly the regulator\u003c--\u003eparent/supply mapping is handled in\nsubsequent patches.\n\nAlso add documentation for regulator bindings to be used to pass\nregulator_init_data struct information from device tree.\n\nSome of the regulator properties which are linux and board specific,\nare left out since its not clear if they can\nbe in someway embedded into the kernel or passed in from DT.\nThey will be revisited later.\n\nSigned-off-by: Rajendra Nayak \u003crnayak@ti.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "186bcda6f6217dc4b5353c3474121bc1194847f6", "tree": "fc2ac1da5e5eb8d2f63f032140743d522aaad7a5", "parents": [ "85e7652d89293a6dab42bfd31f276f8bc072d4c5" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Tue Nov 22 18:21:18 2011 -0700" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Wed Nov 23 11:05:08 2011 +0000" }, "message": "ASoC: Tegra DAS: Add device tree binding\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "5786b6622112ab582c0bf05d6e722ed12a07642f", "tree": "0550e69c28eadfe3e6e26c92ad5b5df53c15247c", "parents": [ "2f534edc1505ab7c6abd4b3389ba3842bf643235" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Mon Oct 17 22:59:05 2011 +0100" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Mon Nov 21 11:03:33 2011 +0000" }, "message": "devicetree: Document Wolfson prefix\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "f9b28ccbc7139af656147dcbba9c5425d5706b7d", "tree": "a10608259acc0487938f30b4669a2c4b678f91c3", "parents": [ "08d33b27f7063ba2b4a29f9e3a2dcb65f30dec0b" ], "author": { "name": "Jamie Iles", "email": "jamie@jamieiles.com", "time": "Tue Sep 27 11:00:46 2011 +0100" }, "committer": { "name": "Marc Zyngier", "email": "marc.zyngier@arm.com", "time": "Tue Nov 15 18:14:02 2011 +0000" }, "message": "ARM: vic: device tree binding\n\nThis adds a device tree binding for the VIC based on the of_irq_init()\nsupport. This adds an irqdomain to the vic and always registers all\nvics in the static vic array rather than for pm only to keep track of\nthe irq domain. struct irq_data::hwirq is used where appropriate rather\nthan runtime masking.\n\nv3:\t- include linux/export.h for THIS_MODULE\nv2:\t- use irq_domain_simple_ops\n\t- remove stub implementation of vic_of_init for !CONFIG_OF\n\t- Make VIC select IRQ_DOMAIN\n\nReviewed-by: Rob Herring \u003crobherring2@gmail.com\u003e\nReviewed-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nTested-by: Thomas Abraham \u003cthomas.abraham@linaro.org\u003e\nSigned-off-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\n" }, { "commit": "db0d4db22a78d31c59087f7057b8f1612fecc35d", "tree": "e2d84ee2c816d4bef066806863a3937792a08581", "parents": [ "cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37" ], "author": { "name": "Marc Zyngier", "email": "marc.zyngier@arm.com", "time": "Sat Nov 12 16:09:49 2011 +0000" }, "committer": { "name": "Marc Zyngier", "email": "marc.zyngier@arm.com", "time": "Tue Nov 15 18:13:03 2011 +0000" }, "message": "ARM: gic: allow GIC to support non-banked setups\n\nThe GIC support code is heavily using the fact that hardware\nimplementations are exposing banked registers. Unfortunately, it\nlooks like at least one GIC implementation (EXYNOS) offers both\nthe distributor and the CPU interfaces at different addresses,\ndepending on the CPU.\n\nThis problem is solved by allowing the distributor and CPU interface\naddresses to be per-cpu variables for the platforms that require it.\nThe EXYNOS code is updated not to mess with the GIC internals while\nhandling interrupts, and struct gic_chip_data is back to being private.\nThe DT binding for the gic is updated to allow an optional \"cpu-offset\"\nvalue, which is used to compute the various base addresses.\n\nFinally, a new config option (GIC_NON_BANKED) is used to control this\nfeature, so the overhead is only present on kernels compiled with\nsupport for EXYNOS.\n\nTested on Origen (EXYNOS4) and Panda (OMAP4).\n\nCc: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nCc: Will Deacon \u003cwill.deacon@arm.com\u003e\nCc: Thomas Abraham \u003cthomas.abraham@linaro.org\u003e\nAcked-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nSigned-off-by: Marc Zyngier \u003cmarc.zyngier@arm.com\u003e\n" }, { "commit": "c511595390a373e19a774246c659b4f563a4c3f3", "tree": "79df5e99ecbff0c8d309e603266698448f998d28", "parents": [ "67348450b86cb1b42aa4dd55cf7cde19c2e53461" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Mon Oct 17 14:56:41 2011 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Thu Nov 10 14:13:33 2011 +0530" }, "message": "dmaengine: at_hdmac: add device tree support\n\nAdd device tree probe support for atmel at_hdmac DMA driver.\nBindings are added to specify DMA controller configuration.\n\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "e0d65113a70f1dc514e625cc4e7a7485a4bf72df", "tree": "7320a130dc304623f5cf4b5dd8f67fb1776225ca", "parents": [ "cf5e15fbd72c13977720aa15b7b7e00e1d8fd8f2", "48e546b7f281f251893baa40769581fd15f085fb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 09:11:16 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 09:11:16 2011 -0800" }, "message": "Merge git://git.infradead.org/mtd-2.6\n\n* git://git.infradead.org/mtd-2.6: (226 commits)\n mtd: tests: annotate as DANGEROUS in Kconfig\n mtd: tests: don\u0027t use mtd0 as a default\n mtd: clean up usage of MTD_DOCPROBE_ADDRESS\n jffs2: add compr\u003dlzo and compr\u003dzlib options\n jffs2: implement mount option parsing and compression overriding\n mtd: nand: initialize ops.mode\n mtd: provide an alias for the redboot module name\n mtd: m25p80: don\u0027t probe device which has status of \u0027disabled\u0027\n mtd: nand_h1900 never worked\n mtd: Add DiskOnChip G3 support\n mtd: m25p80: add EON flash EN25Q32B into spi flash id table\n mtd: mark block device queue as non-rotational\n mtd: r852: make r852_pm_ops static\n mtd: m25p80: add support for at25df321a spi data flash\n mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks\n mtd: nand: switch `check_pattern()\u0027 to standard `memcmp()\u0027\n mtd: nand: invalidate cache on unaligned reads\n mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set\n mtd: nand: wait to set BBT version\n mtd: nand: scrub BBT on ECC errors\n ...\n\nFix up trivial conflicts:\n - arch/arm/mach-at91/board-usb-a9260.c\n\tMerged into board-usb-a926x.c\n - drivers/mtd/maps/lantiq-flash.c\n\tadd_mtd_partitions -\u003e mtd_device_register vs changed to use\n\tmtd_device_parse_register.\n" }, { "commit": "1197ab2942f920f261952de0c392ac749a35796b", "tree": "4922ccc8a6061e5ece6ac7420001f3bf4524ea92", "parents": [ "ec773e99ab4abce07b1ae23117179c2861831964", "96cc017c5b7ec095ef047d3c1952b6b6bbf98943" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 17:12:03 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 17:12:03 2011 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (106 commits)\n powerpc/p3060qds: Add support for P3060QDS board\n powerpc/83xx: Add shutdown request support to MCU handling on MPC8349 MITX\n powerpc/85xx: Make kexec to interate over online cpus\n powerpc/fsl_booke: Fix comment in head_fsl_booke.S\n powerpc/85xx: issue 15 EOI after core reset for FSL CoreNet devices\n powerpc/8xxx: Fix interrupt handling in MPC8xxx GPIO driver\n powerpc/85xx: Add \u0027fsl,pq3-gpio\u0027 compatiable for GPIO driver\n powerpc/86xx: Correct Gianfar support for GE boards\n powerpc/cpm: Clear muram before it is in use.\n drivers/virt: add ioctl for 32-bit compat on 64-bit to fsl-hv-manager\n powerpc/fsl_msi: add support for \"msi-address-64\" property\n powerpc/85xx: Setup secondary cores PIR with hard SMP id\n powerpc/fsl-booke: Fix settlbcam for 64-bit\n powerpc/85xx: Adding DCSR node to dtsi device trees\n powerpc/85xx: clean up FPGA device tree nodes for Freecsale QorIQ boards\n powerpc/85xx: fix PHYS_64BIT selection for P1022DS\n powerpc/fsl-booke: Fix setup_initial_memory_limit to not blindly map\n powerpc: respect mem\u003d setting for early memory limit setup\n powerpc: Update corenet64_smp_defconfig\n powerpc: Update mpc85xx/corenet 32-bit defconfigs\n ...\n\nFix up trivial conflicts in:\n - arch/powerpc/configs/40x/hcu4_defconfig\n\tremoved stale file, edited elsewhere\n - arch/powerpc/include/asm/udbg.h, arch/powerpc/kernel/udbg.c:\n\tadded opal and gelic drivers vs added ePAPR driver\n - drivers/tty/serial/8250.c\n\tmoved UPIO_TSI to powerpc vs removed UPIO_DWAPB support\n" }, { "commit": "6b1506c66809ddf6afd17e330db2999c878b5d90", "tree": "eb93535fcc3e568ffabd5400b019463633ea2c22", "parents": [ "1a67a573b8d9f02211f36fbab50f6265dc49384a", "50e07f888cb24b55e0d8283f631907794dd757c2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 07:49:29 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 07:49:29 2011 -0700" }, "message": "Merge branch \u0027devicetree/merge\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027devicetree/merge\u0027 of git://git.secretlab.ca/git/linux-2.6:\n dt: add empty of_machine_is_compatible\n ahci: add DT binding for Calxeda AHCI controller\n dt/platform: minor cleanup\n dt: add empty of_alias_get_id() for non-dt builds\n" }, { "commit": "02aac316abf436a7529d46a71f7083f9f9ef4b49", "tree": "f6104530b98e312d146a3c3780b79de238ec4763", "parents": [ "303f59d1a71ebf1ede04b2adb07e3f545e53b7ba" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Wed Nov 03 21:04:59 2010 -0500" }, "committer": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Thu Nov 03 15:52:38 2011 -0500" }, "message": "ahci: add DT binding for Calxeda AHCI controller\n\nAdd devicetree match table to ahci platform driver for Calxeda Highbank\nAHCI controller.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: Jeff Garzik \u003cjgarzik@pobox.com\u003e\nCc: linux-ide@vger.kernel.org\nCc: linux-kernel@vger.kernel.org\nCc: devicetree-discuss@lists.ozlabs.org\n" }, { "commit": "80c2861672bbf000f6af838656959ee937e4ee4d", "tree": "78b361fd7278d461b1e664272f3b27660b64c642", "parents": [ "d211858837ff8d8e31942ca7d27e6e08b3b46f5e", "5087a50e66bd51b6e72c60bce4757a42b93f6b2c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 15:00:56 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 15:00:56 2011 -0700" }, "message": "Merge git://github.com/rustyrussell/linux\n\n* git://github.com/rustyrussell/linux:\n virtio-blk: use ida to allocate disk index\n virtio: Add platform bus driver for memory mapped virtio device\n virtio: Dont add \"config\" to list for !per_vq_vector\n virtio: console: wait for first console port for early console output\n virtio: console: add port stats for bytes received, sent and discarded\n virtio: console: make discard_port_data() use get_inbuf()\n virtio: console: rename variable\n virtio: console: make get_inbuf() return port-\u003einbuf if present\n virtio: console: Fix return type for get_inbuf()\n virtio: console: Use wait_event_freezable instead of _interruptible\n virtio: console: Ignore port name update request if name already set\n virtio: console: Fix indentation\n virtio: modify vring_init and vring_size to take account of the layout containing *_event_idx\n virtio.h: correct comment for struct virtio_driver\n virtio-net: Use virtio_config_val() for retrieving config\n virtio_config: Add virtio_config_val_len()\n virtio-console: Use virtio_config_val() for retrieving config\n" }, { "commit": "994c0e992522c123298b4a91b72f5e67ba2d1123", "tree": "411952f844b8e1d5ef2854e44df793529078d3eb", "parents": [ "367069f16e32e188d4687fe2c3e30f2ca583836f", "abc3f126ac736280c68db6472eb0040ddf6e1b1f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 21:08:03 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 21:08:03 2011 -0700" }, "message": "Merge branch \u0027next/soc\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/soc\u0027 of git://git.linaro.org/people/arnd/arm-soc: (21 commits)\n MAINTAINERS: add ARM/FREESCALE IMX6 entry\n arm/imx: merge i.MX3 and i.MX6\n arm/imx6q: add suspend/resume support\n arm/imx6q: add device tree machine support\n arm/imx6q: add smp and cpu hotplug support\n arm/imx6q: add core drivers clock, gpc, mmdc and src\n arm/imx: add gic_handle_irq function\n arm/imx6q: add core definitions and low-level debug uart\n arm/imx6q: add device tree source\n ARM: highbank: add suspend support\n ARM: highbank: Add cpu hotplug support\n ARM: highbank: add SMP support\n MAINTAINERS: add Calxeda Highbank ARM platform\n ARM: add Highbank core platform support\n ARM: highbank: add devicetree source\n ARM: l2x0: add empty l2x0_of_init\n picoxcell: add a definition of VMALLOC_END\n picoxcell: remove custom ioremap implementation\n picoxcell: add the DTS for the PC7302 board\n picoxcell: add the DTS for pc3x2 and pc3x3 devices\n ...\n\nFix up trivial conflicts in arch/arm/Kconfig, and some more header file\nconflicts in arch/arm/mach-omap2/board-generic.c (as per an ealier merge\nby Arnd).\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": "81a3c10ce8a7fd5bf9a06bfc38bd417512911831", "tree": "12ceac10fae8c4b2dc17b362672a5db305a8d960", "parents": [ "6585dea1f99cc2265582ff2e4cc1727062136e92", "df80442d1ee2902c2e39f90f18160f2e08d14c06" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:58:25 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:58:25 2011 -0700" }, "message": "Merge branch \u0027next/cleanup2\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/cleanup2\u0027 of git://git.linaro.org/people/arnd/arm-soc: (31 commits)\n ARM: OMAP: Warn if omap_ioremap is called before SoC detection\n ARM: OMAP: Move set_globals initialization to happen in init_early\n ARM: OMAP: Map SRAM later on with ioremap_exec()\n ARM: OMAP: Remove calls to SRAM allocations for framebuffer\n ARM: OMAP: Avoid cpu_is_omapxxxx usage until map_io is done\n ARM: OMAP1: Use generic map_io, init_early and init_irq\n arm/dts: OMAP3+: Add mpu, dsp and iva nodes\n arm/dts: OMAP4: Add a main ocp entry bound to l3-noc driver\n ARM: OMAP2+: l3-noc: Add support for device-tree\n ARM: OMAP2+: board-generic: Add i2c static init\n ARM: OMAP2+: board-generic: Add DT support to generic board\n arm/dts: Add support for OMAP3 Beagle board\n arm/dts: Add initial device tree support for OMAP3 SoC\n arm/dts: Add support for OMAP4 SDP board\n arm/dts: Add support for OMAP4 PandaBoard\n arm/dts: Add initial device tree support for OMAP4 SoC\n ARM: OMAP: omap_device: Add a method to build an omap_device from a DT node\n ARM: OMAP: omap_device: Add omap_device_[alloc|delete] for DT integration\n of: Add helpers to get one string in multiple strings property\n ARM: OMAP2+: devices: Remove all omap_device_pm_latency structures\n ...\n\nFix up trivial header file conflicts in arch/arm/mach-omap2/board-generic.c\n" }, { "commit": "16ee792e45cf0c97ce061fce03c36cab5551ec72", "tree": "dc68af705fbac4b5d71325aa972730199bb187dd", "parents": [ "f906fb1d70e016726fccfb0d978c5d425503db9d", "efa62e1355f0495f37f1296754b8880947c8da72" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:31:25 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:31:25 2011 -0700" }, "message": "Merge branch \u0027next/devel\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/devel\u0027 of git://git.linaro.org/people/arnd/arm-soc: (50 commits)\n ARM: tegra: update defconfig\n arm/tegra: Harmony: Configure PMC for low-level interrupts\n arm/tegra: device tree support for ventana board\n arm/tegra: add support for ventana pinmuxing\n arm/tegra: prepare Seaboard pinmux code for derived boards\n arm/tegra: pinmux: ioremap registers\n gpio/tegra: Convert to a platform device\n arm/tegra: Convert pinmux driver to a platform device\n arm/dt: Tegra: Add pinmux node to tegra20.dtsi\n arm/tegra: Prep boards for gpio/pinmux conversion to pdevs\n ARM: mx5: fix clock usage for suspend\n ARM i.MX entry-macro.S: remove now unused code\n ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLER\n ARM i.MX tzic: add handle_irq function\n ARM i.MX avic: add handle_irq function\n ARM: mx25: Add the missing IIM base definition\n ARM i.MX avic: convert to use generic irq chip\n mx31moboard: Add poweroff support\n ARM: mach-qong: Add watchdog support\n ARM: davinci: AM18x: Add wl1271/wlan support\n ...\n\nFix up conflicts in:\n\tarch/arm/mach-at91/at91sam9g45.c\n\tarch/arm/mach-mx5/devices-imx53.h\n\tarch/arm/plat-mxc/include/mach/memory.h\n" }, { "commit": "abc3f126ac736280c68db6472eb0040ddf6e1b1f", "tree": "4e3333cde6da6c49dcd81920410bf5a33055f03a", "parents": [ "b8df0ea26ac17c9a073f235c7fdfbdd1851b59ea", "8bcb97659656042f3132b2814b19709856aa1335" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Nov 02 02:46:55 2011 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Nov 02 02:46:55 2011 +0100" }, "message": "Merge branch \u0027imx/imx6q\u0027 into next/soc\n\nConflicts:\n\tDocumentation/devicetree/bindings/arm/fsl.txt\n\tarch/arm/Kconfig\n\tarch/arm/Kconfig.debug\n\tarch/arm/plat-mxc/include/mach/common.h\n" }, { "commit": "b8df0ea26ac17c9a073f235c7fdfbdd1851b59ea", "tree": "5e57a2fdc5fa05155d7d8214ad054b16f6b1c3d8", "parents": [ "884897e6a10a86de0e611a76f4bf3fd0068a672c", "76780127914d5dc69a458eda5e471e65a5fd3dc9" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Nov 02 02:46:17 2011 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Nov 02 02:46:17 2011 +0100" }, "message": "Merge branch \u0027picoxcell/soc\u0027 into next/soc\n" }, { "commit": "884897e6a10a86de0e611a76f4bf3fd0068a672c", "tree": "019689fb9d129404af1efba4df10975bc9e0a57a", "parents": [ "c72dbae971400e466ad9ff16c920cd6d9d8c55a1", "8b61f37440388ebbd2a894178fe098f2e70ab392" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Nov 02 02:46:10 2011 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Nov 02 02:46:10 2011 +0100" }, "message": "Merge branch \u0027highbank/soc\u0027 into next/soc\n\nConflicts:\n\tarch/arm/mach-mxs/include/mach/gpio.h\n\tarch/arm/mach-omap2/board-generic.c\n\tarch/arm/plat-mxc/include/mach/gpio.h\n" }, { "commit": "edfd52e6367270c90f3fd7cc302b375ffa89f91e", "tree": "1a847022a6ee87524461ecd2427e7f23acab48ce", "parents": [ "005b20a8e0f587a46a00910ba4507bb9f6da70ea" ], "author": { "name": "Pawel Moll", "email": "pawel.moll@arm.com", "time": "Mon Oct 24 14:07:03 2011 +0100" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Nov 02 11:41:01 2011 +1030" }, "message": "virtio: Add platform bus driver for memory mapped virtio device\n\nThis patch, based on virtio PCI driver, adds support for memory\nmapped (platform) virtio device. This should allow environments\nlike qemu to use virtio-based block \u0026 network devices even on\nplatforms without PCI support.\n\nOne can define and register a platform device which resources\nwill describe memory mapped control registers and \"mailbox\"\ninterrupt. Such device can be also instantiated using the Device\nTree node with compatible property equal \"virtio,mmio\".\n\nCc: Anthony Liguori \u003caliguori@us.ibm.com\u003e\nCc: Michael S.Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Pawel Moll \u003cpawel.moll@arm.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "b4beb4bf9934d151bf4581a54ae028927374cb2a", "tree": "28475f62b18784e1d10b05e901799d02c054587f", "parents": [ "f3c3f0670501fee130f22193369249deea8cc630", "3945fe9314af718946f71185901c28dd349469c7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 15:07:19 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 15:07:19 2011 -0700" }, "message": "Merge branch \u0027for-linus/i2c-3.2\u0027 of git://git.fluff.org/bjdooks/linux\n\n* \u0027for-linus/i2c-3.2\u0027 of git://git.fluff.org/bjdooks/linux: (47 commits)\n i2c-s3c2410: Add device tree support\n i2c-s3c2410: Keep a copy of platform data and use it\n i2c-nomadik: cosmetic coding style corrections\n i2c-au1550: dev_pm_ops conversion\n i2c-au1550: increase timeout waiting for master done\n i2c-au1550: remove unused ack_timeout\n i2c-au1550: remove usage of volatile keyword\n i2c-tegra: __iomem annotation fix\n i2c-eg20t: Add initialize processing in case i2c-error occurs\n i2c-eg20t: Fix flag setting issue\n i2c-eg20t: add stop sequence in case wait-event timeout occurs\n i2c-eg20t: Separate error processing\n i2c-eg20t: Fix 10bit access issue\n i2c-eg20t: Modify returned value s32 to long\n i2c-eg20t: Fix bus-idle waiting issue\n i2c-designware: Fix PCI core warning on suspend/resume\n i2c-designware: Add runtime power management support\n i2c-designware: Add support for Designware core behind PCI devices.\n i2c-designware: Push all register reads/writes into the core code.\n i2c-designware: Support multiple cores using same ISR\n ...\n" }, { "commit": "dc47d3810cdcb4f32bfa31d50f26af97aced0638", "tree": "f1574adeaae857d935ad9c2e08a19727e54ef14a", "parents": [ "f6d90b4f9ce018bff429d6e01ee672de712b8641", "5db017aa2809c49ca0a43b0f3ed1267e6be60883" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 09:24:41 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 09:24:41 2011 -0700" }, "message": "Merge git://github.com/herbertx/crypto\n\n* git://github.com/herbertx/crypto: (48 commits)\n crypto: user - Depend on NET instead of selecting it\n crypto: user - Add dependency on NET\n crypto: talitos - handle descriptor not found in error path\n crypto: user - Initialise match in crypto_alg_match\n crypto: testmgr - add twofish tests\n crypto: testmgr - add blowfish test-vectors\n crypto: Make hifn_795x build depend on !ARCH_DMA_ADDR_T_64BIT\n crypto: twofish-x86_64-3way - fix ctr blocksize to 1\n crypto: blowfish-x86_64 - fix ctr blocksize to 1\n crypto: whirlpool - count rounds from 0\n crypto: Add userspace report for compress type algorithms\n crypto: Add userspace report for cipher type algorithms\n crypto: Add userspace report for rng type algorithms\n crypto: Add userspace report for pcompress type algorithms\n crypto: Add userspace report for nivaead type algorithms\n crypto: Add userspace report for aead type algorithms\n crypto: Add userspace report for givcipher type algorithms\n crypto: Add userspace report for ablkcipher type algorithms\n crypto: Add userspace report for blkcipher type algorithms\n crypto: Add userspace report for ahash type algorithms\n ...\n" }, { "commit": "3945fe9314af718946f71185901c28dd349469c7", "tree": "cd716993a757f6bf61c48a2f88ef4c286c5fa994", "parents": [ "be4af5dfa6d976ba579bae16ff8714b755d44dad", "8abf6fbbd22bc777fd4027cbc55e99cdfb7a8324", "5a5f50802f5a31b9e15de8df40d5621af970a560", "f533c61e1921b93aa247d72d39c3fbe045340a9a" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue Nov 01 00:54:17 2011 +0000" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue Nov 01 00:54:17 2011 +0000" }, "message": "Merge branches \u0027for-32/i2c/nomadik\u0027, \u0027for-32/i2c/s3c2410-dt\u0027 and \u0027for-32/i2c/tegra-iomem\u0027 into for-linus/i2c-3.2\n" }, { "commit": "ce0fda16084905d035e8ceb51cf42740ad781b15", "tree": "dd94ce9468c16b72a9e6cf6e0ce8ac7b1d7530c9", "parents": [ "c9c7ae40660f5983854f73b6ae65f208e9a15082", "dfcd04b19d16c0016c705ed96a8b3cfa5315a2e9", "24597bf8012cf3fa5703c38e1bb13df3118d7588", "52c2843322362bfd847bdda1d3cebc751de68e5b", "46f344e2a0844d9b068bffa38cb48b52f4bd2d4a" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue Nov 01 00:50:09 2011 +0000" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue Nov 01 00:50:09 2011 +0000" }, "message": "Merge branches \u0027for-32/i2c/omap-v4\u0027, \u0027for-32/i2c/imx-dt\u0027, \u0027for-32/i2c/eg20t-v4\u0027, \u0027for-32/i2c/designware-v5\u0027 and \u0027for-32/i2c/au1550\u0027 into for-linus/i2c-3.2\n" }, { "commit": "7d740f87fd0741c00231a4b13074660d526d5630", "tree": "aa65429bf9d8c1e7f89a9a7036338cad1eaf5f3d", "parents": [ "ccfa8b21f20099b950b4f2f75d2330fb149a2012" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Tue Sep 06 13:53:26 2011 +0800" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Oct 31 14:26:20 2011 +0100" }, "message": "arm/imx6q: add device tree source\n\nIt adds device tree source and documentation for imx6q platform.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\n" }, { "commit": "253d7addbcb06acc90eb722f122d32a6ccbf67a7", "tree": "763993c907d7c6afe65b74f05d31a4a0a3e1ac83", "parents": [ "fae2b89ab13f6181cb418d788b66a44758cc71d4" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Wed Aug 10 15:22:11 2011 -0500" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Oct 31 14:13:58 2011 +0100" }, "message": "ARM: highbank: add devicetree source\n\nThis adds the devicetree source and documentation for the Calxeda highbank\nplatform.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nReviewed-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nReviewed-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\n" }, { "commit": "09fa31a322c8f03871a741cd1d26e5ca04aacbbd", "tree": "acdad13d7c332978a91231c4f34b6320a1c7ceb6", "parents": [ "2b228e8cf33dbdd323dd4a05a973c6bd45c44133", "f37a53cc5d8a8fb199e41386d125d8c2ed9e54ef" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Oct 31 14:11:34 2011 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Oct 31 14:11:34 2011 +0100" }, "message": "Merge branch \u0027dt/gic\u0027 into highbank/soc\n\nConflicts:\n\tarch/arm/Kconfig\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" } ], "next": "86c1e5a74af11e4817ffa6d7748d9ac1353b5b53" }