)]}' { "log": [ { "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": "9fc5c3e3237e02a94f41cd1d2b4291593d29791d", "tree": "c8823725b10bd4d36e9311ea392dfdecb4db7974", "parents": [ "541048a1d31399ccdda27346a37eae4a2ad55186", "7c9c3a1e5fc8728e948b8fa3cbcfcfb86db3afda" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 19:13:40 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 19:13:40 2012 -0800" }, "message": "Merge branch \u0027x86-platform-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027x86-platform-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86/intel config: Fix the APB_TIMER selection\n x86/mrst: Add additional debug prints for pb_keys\n x86/intel config: Revamp configuration to allow for Moorestown and Medfield\n x86/intel/scu/ipc: Match the changes in the x86 configuration\n x86/apb: Fix configuration constraints\n x86: Fix INTEL_MID silly\n x86/Kconfig: Cyclone-timer depends on x86-summit\n x86: Reduce clock calibration time during slave cpu startup\n x86/config: Revamp configuration for MID devices\n x86/sfi: Kill the IRQ as id hack\n" }, { "commit": "c2e08e7ce5ab25a781197a71c5241742e8c9fdfe", "tree": "70cce0b2f4cb82b1670e987169a7790e8467cf41", "parents": [ "28190145543260c155216b9bd3adf57bee50f8b2", "b3a0aa3ae1c0889ffe8abb2e326d5c74c7c9c097" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 17:37:20 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 17:37:20 2012 -0800" }, "message": "Merge branch \u0027unicore32\u0027 of git://github.com/gxt/linux\n\n* \u0027unicore32\u0027 of git://github.com/gxt/linux:\n rtc-puv3: solve section mismatch in rtc-puv3.c\n rtc-puv3: using module_platform_driver()\n i2c-puv3: using module_platform_driver()\n rtc-puv3: irq: remove IRQF_DISABLED\n unicore32: Remove IRQF_DISABLED\n unicore32: Use set_current_blocked()\n unicore32: add ioremap_nocache definition\n unicore32: delete specified xlate_dev_mem_ptr\n of: add include asm/setup.h in drivers/of/fdt.c\n unicore32: standardize /proc/iomem \"Kernel code\" name\n" }, { "commit": "e74a8f2edb92cb690b467cea0ab652c509e9f624", "tree": "346aa7fc0b5d6ad1d52c8fc1de883fb085d94daa", "parents": [ "948170f8944dfd29d13612fff48110a9814daeb1" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Tue Jan 10 15:11:02 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:53 2012 -0800" }, "message": "drivers/rtc/interface.c: fix alarm rollover when day or month is out-of-range\n\nCommit f44f7f96a20a (\"RTC: Initialize kernel state from RTC\") introduced a\npotential infinite loop. If an alarm time contains a wildcard month and\nan invalid day (\u003e 31), or a wildcard year and an invalid month (\u003e\u003d 12),\nthe loop searching for the next matching date will never terminate. Treat\nthe invalid values as wildcards.\n\nFixes \u003chttp://bugs.debian.org/646429\u003e, \u003chttp://bugs.debian.org/653331\u003e\n\nReported-by: leo weppelman \u003cleoweppelman@googlemail.com\u003e\nReported-by: \"P. van Gaans\" \u003cmailme667@yahoo.co.uk\u003e\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: Jonathan Nieder \u003cjrnieder@gmail.com\u003e\nCc: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nCc: Marcelo Roberto Jimenez \u003cmroberto@cpti.cetuc.puc-rio.br\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: John Stultz \u003cjohn.stultz@linaro.org\u003e\nAcked-by: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\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": "6c3fb55793f79bc975df0494c4d56ea6f0b0cc45", "tree": "066d5bd1fff16e0109999a9fabd51c4a346d7c62", "parents": [ "681d0378a9057a92b9e6e51c2112e53d920a092d" ], "author": { "name": "Lars-Peter Clausen", "email": "lars@metafoo.de", "time": "Tue Jan 10 15:10:58 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:53 2012 -0800" }, "message": "drivers/rtc/: remove redundant spi driver bus initialization\n\nIn ancient times it was necessary to manually initialize the bus field of\nan spi_driver to spi_bus_type. These days this is done in\nspi_driver_register(), so we can drop the manual assignment.\n\nThe patch was generated using the following coccinelle semantic patch:\n// \u003csmpl\u003e\n@@\nidentifier _driver;\n@@\nstruct spi_driver _driver \u003d {\n\t.driver \u003d {\n-\t\t.bus \u003d \u0026spi_bus_type,\n\t},\n};\n// \u003c/smpl\u003e\n\nSigned-off-by: Lars-Peter Clausen \u003clars@metafoo.de\u003e\nCc: John Stultz \u003cjohn.stultz@linaro.org\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "681d0378a9057a92b9e6e51c2112e53d920a092d", "tree": "ec33c3354ef30d3e34557fb1b6a4a98e8f88e32f", "parents": [ "a46481d7af1e6c59c03f3ddac400d9054f804952" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Tue Jan 10 15:10:55 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:53 2012 -0800" }, "message": "drivers/rtc/rtc-jz4740.c: make jz4740_rtc_driver static\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nCc: Lars-Peter Clausen \u003clars@metafoo.de\u003e\nCc: 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": "a46481d7af1e6c59c03f3ddac400d9054f804952", "tree": "9e0aa62c215bfb578c5f36ed3b6e1bd536ba436e", "parents": [ "0c4eae66591a292fee70051ea363a8d27aa54102" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Tue Jan 10 15:10:52 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:53 2012 -0800" }, "message": "drivers/rtc/rtc-mc13xxx.c: make mc13xxx_rtc_idtable static\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nAcked-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nAcked-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0c4eae66591a292fee70051ea363a8d27aa54102", "tree": "8dce311ce5149432eee9e55a2a7f4c58aaa239fa", "parents": [ "5f85d20d04cdc4c6ed15022a5ed76907ad88d4ae" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Tue Jan 10 15:10:48 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:53 2012 -0800" }, "message": "rtc: convert drivers/rtc/* to use module_platform_driver()\n\nThis patch converts the drivers in drivers/rtc/* to use the\nmodule_platform_driver() macro which makes the code smaller and a bit\nsimpler.\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nAcked-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nAcked-by: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Srinidhi Kasagar \u003csrinidhi.kasagar@stericsson.com\u003e\nCc: Lars-Peter Clausen \u003clars@metafoo.de\u003e\nCc: Ben Dooks \u003cben@simtec.co.uk\u003e\nCc: John Stultz \u003cjohn.stultz@linaro.org\u003e\nAcked-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5f85d20d04cdc4c6ed15022a5ed76907ad88d4ae", "tree": "5f470974850b61582320c4ba5a47a17337b97874", "parents": [ "2d65943e55bdd538640d0908bc9f3ead138b0431" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Tue Jan 10 15:10:44 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:52 2012 -0800" }, "message": "drivers/rtc/rtc-wm831x.c: convert to devm_kzalloc()\n\nMarginally less code and eliminate the possibility of memory leaks.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nAcked-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nCc: 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": "2d65943e55bdd538640d0908bc9f3ead138b0431", "tree": "45f76efff8ba8d2e4f52b6d930b1a1771abe6bc7", "parents": [ "dda367ac064d7473d397b1965019fb3be7cfb6b0" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Tue Jan 10 15:10:43 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:52 2012 -0800" }, "message": "drivers/rtc/rtc-wm831x.c: remove unused period IRQ handler\n\nDue to changes in the RTC core the period interrupt is now unused so\ndelete the code managing it.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nCc: 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": "dda367ac064d7473d397b1965019fb3be7cfb6b0", "tree": "332b14ebfc6340c6941be7ec64250093ee631f3d", "parents": [ "012e52e15e7ebbc7b08165e8f4b10f71a3e6810b" ], "author": { "name": "Mark Godfrey", "email": "mark.godfrey@stericsson.com", "time": "Tue Jan 10 15:10:42 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:52 2012 -0800" }, "message": "rtc/ab8500: add calibration attribute to AB8500 RTC\n\nThe rtc_calibration attribute allows user-space to get and set the\nAB8500\u0027s RtcCalibration register. The AB8500 will then use the value in\nthis register to compensate for RTC drift every 60 seconds.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Mark Godfrey \u003cmark.godfrey@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nAcked-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nCc: 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": "012e52e15e7ebbc7b08165e8f4b10f71a3e6810b", "tree": "83b34597c52f4bb13f9a7341321e5cc7cedf5680", "parents": [ "b62581e6241c33b9fef45117f86830058738371f" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Tue Jan 10 15:10:41 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:52 2012 -0800" }, "message": "drivers/rtc/rtc-ab8500.c: change msleep() to usleep_range()\n\nThe resolution of msleep is related to HZ, so with HZ set to 100 any\nmsleep of less than 10ms will become ~10ms. This is not what we want.\nUse the hrtimer-based usleep_range() and allow for some slack in the\nnon-critical path so we have more control of what is happening here.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nCc: Jonas Aaberg \u003cjonas.aberg@stericsson.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b62581e6241c33b9fef45117f86830058738371f", "tree": "41507fcead5502264742448d13c0a2552d6fa03a", "parents": [ "10d065e65b0be33e868f9c6da67026b5111480d8" ], "author": { "name": "Andrew Lynn", "email": "andrew.lynn@stericsson.com", "time": "Tue Jan 10 15:10:38 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:52 2012 -0800" }, "message": "rtc/ab8500: set can_wake flag\n\nSet can_wake flag so wakealarm property is visible in sysfs.\n\nSigned-off-by: Andrew Lynn \u003candrew.lynn@stericsson.com\u003e\nReviewed-by: Jonas ABERG \u003cjonas.aberg@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nCc: 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": "10d065e65b0be33e868f9c6da67026b5111480d8", "tree": "8cd847ee24e44791c9d214af5ad6772072872c5f", "parents": [ "c92182ee0b5a33c74e4b6c0ded36166e4ef3bc3e" ], "author": { "name": "Robert Marklund", "email": "robert.marklund@stericsson.com", "time": "Tue Jan 10 15:10:35 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:52 2012 -0800" }, "message": "rtc/ab8500: don\u0027t disable IRQ:s when suspending\n\nWe want this driver to be able to wake up the system.\n\nSigned-off-by: Robert Marklund \u003crobert.marklund@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nCc: 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": "c92182ee0b5a33c74e4b6c0ded36166e4ef3bc3e", "tree": "4583c06816318f4e4b4216239f83d91aa11b5fbe", "parents": [ "7287be1d0ac8c82999b67c2a33517c6ec9cfdbe7" ], "author": { "name": "Yauhen Kharuzhy", "email": "jekhor@gmail.com", "time": "Tue Jan 10 15:10:34 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:52 2012 -0800" }, "message": "drivers/rtc/rtc-mxc.c: make alarm work\n\nFix alarm IRQ handling, make the alarm one-shot. Cleanup black magick\nwith a validation of already validated time data.\n\nAdd ability to wake the system with alarm.\n\n[akpm@linux-foundation.org: fix CONFIG_PM\u003dn build]\nSigned-off-by: Yauhen Kharuzhy \u003cjekhor@gmail.com\u003e\nCc: Daniel Mack \u003cdaniel@caiaq.de\u003e\nCc: 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": "7287be1d0ac8c82999b67c2a33517c6ec9cfdbe7", "tree": "7ed79d428bec700c2288c83cf3d685f87aa7019a", "parents": [ "b43c1ea4d622b6951377de92edfb219d893e23ef" ], "author": { "name": "Yauhen Kharuzhy", "email": "jekhor@gmail.com", "time": "Tue Jan 10 15:10:32 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:52 2012 -0800" }, "message": "drivers/rtc/rtc-mxc.c: fix setting time for MX1 SoC\n\nThere is no way to track year in the i.MX1 RTC: Days Counter register is\n9-bit wide only. Attempt to save date after 1970-01-01 plus 512 days\ncauses endless loop in mxc_rtc_set_mmss(). Fix this by resetting year to\n1970.\n\n[akpm@linux-foundation.org: use conventional comment layout]\nSigned-off-by: Yauhen Kharuzhy \u003cjekhor@gmail.com\u003e\nCc: Daniel Mack \u003cdaniel@caiaq.de\u003e\nCc: 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": "b43c1ea4d622b6951377de92edfb219d893e23ef", "tree": "9275010ed3f8a4eb521e2ceafe1ef2605b7b9b3b", "parents": [ "e26d196cc88c5436ca93532cabce87dbd8bf49b4" ], "author": { "name": "Ondrej Zary", "email": "linux@rainbow-software.org", "time": "Tue Jan 10 15:10:26 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:52 2012 -0800" }, "message": "drivers/rtc/rtc-cmos.c: fix broken NVRAM bank 2 writing\n\nFix writing to NVRAM bank 2 in rtc-cmos driver. It never worked since its\nintroduction in 2.6.28 because of a typo.\n\nSigned-off-by: Ondrej Zary \u003clinux@rainbow-software.org\u003e\nCc: 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": "b3a0aa3ae1c0889ffe8abb2e326d5c74c7c9c097", "tree": "b090bbc015f3dd5e41bc51e26e37da4bd0574ddc", "parents": [ "60e2b00ea200e1527668bfb766ecbdf578ad7de8" ], "author": { "name": "Guan Xuetao", "email": "gxt@mprc.pku.edu.cn", "time": "Wed Dec 28 09:24:29 2011 +0800" }, "committer": { "name": "Guan Xuetao", "email": "gxt@mprc.pku.edu.cn", "time": "Tue Jan 10 10:29:42 2012 +0800" }, "message": "rtc-puv3: solve section mismatch in rtc-puv3.c\n\nThe patch renames puv3_rtcdrv to puv3_rtc_driver, so that modpost will know\nthat this is simply a list of pointers to driver functions, in which case\nthe section mismatch is OK. (Thanks Michal Marek)\n\nCc: Axel Lin \u003caxel.lin@gmail.com\u003e\nCc: Michal Marek \u003cmmarek@suse.cz\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: rtc-linux@googlegroups.com\nSigned-off-by: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\n\n--\nSection mismatch warning information:\n\nWARNING: drivers/rtc/built-in.o(.data+0x90): Section mismatch in\nreference from the variable puv3_rtcdrv to the\nfunction .devinit.text:puv3_rtc_probe()\nThe variable puv3_rtcdrv references\nthe function __devinit puv3_rtc_probe()\nIf the reference is valid then annotate the\nvariable with __init* or __refdata (see linux/init.h) or name the\nvariable:\n*driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one,\n*_console\n\nWARNING: drivers/rtc/built-in.o(.data+0x94): Section mismatch in\nreference from the variable puv3_rtcdrv to the\nfunction .devexit.text:puv3_rtc_remove()\nThe variable puv3_rtcdrv references\nthe function __devexit puv3_rtc_remove()\nIf the reference is valid then annotate the\nvariable with __exit* (see linux/init.h) or name the variable:\n*driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one,\n*_console\n\nWARNING: drivers/built-in.o(.data+0x6c04): Section mismatch in reference\nfrom the variable puv3_rtcdrv to the\nfunction .devinit.text:puv3_rtc_probe()\nThe variable puv3_rtcdrv references\nthe function __devinit puv3_rtc_probe()\nIf the reference is valid then annotate the\nvariable with __init* or __refdata (see linux/init.h) or name the\nvariable:\n*driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one,\n*_console\n\nWARNING: drivers/built-in.o(.data+0x6c08): Section mismatch in reference\nfrom the variable puv3_rtcdrv to the\nfunction .devexit.text:puv3_rtc_remove()\nThe variable puv3_rtcdrv references\nthe function __devexit puv3_rtc_remove()\nIf the reference is valid then annotate the\nvariable with __exit* (see linux/init.h) or name the variable:\n*driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one,\n*_console\n\nWARNING: vmlinux.o(.data+0x1126c): Section mismatch in reference from\nthe variable puv3_rtcdrv to the function .devinit.text:puv3_rtc_probe()\nThe variable puv3_rtcdrv references\nthe function __devinit puv3_rtc_probe()\nIf the reference is valid then annotate the\nvariable with __init* or __refdata (see linux/init.h) or name the\nvariable:\n*driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one,\n*_console\n\nWARNING: vmlinux.o(.data+0x11270): Section mismatch in reference from\nthe variable puv3_rtcdrv to the function .devexit.text:puv3_rtc_remove()\nThe variable puv3_rtcdrv references\nthe function __devexit puv3_rtc_remove()\nIf the reference is valid then annotate the\nvariable with __exit* (see linux/init.h) or name the variable:\n*driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one,\n*_console\n" }, { "commit": "60e2b00ea200e1527668bfb766ecbdf578ad7de8", "tree": "a278ccad1a1c921c1d4eac69d69cb50e05466191", "parents": [ "858af58f67d4aba8afb02438e74292b9273cdb10" ], "author": { "name": "Guan Xuetao", "email": "gxt@mprc.pku.edu.cn", "time": "Mon Dec 26 17:03:50 2011 +0800" }, "committer": { "name": "Guan Xuetao", "email": "gxt@mprc.pku.edu.cn", "time": "Tue Jan 10 10:29:42 2012 +0800" }, "message": "rtc-puv3: using module_platform_driver()\n\nThis patch converts the driver to use the module_platform_driver()\nmacro which makes the code smaller and a bit simpler.\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nSigned-off-by: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\n" }, { "commit": "a9196b0bd3284fa3388998c9208a708a8f2e4c83", "tree": "8f0748ed290e842bb528c206b430e8f65d7ede13", "parents": [ "86abc23ed146522b276f63032574f358bcfe0392" ], "author": { "name": "Guan Xuetao", "email": "gxt@mprc.pku.edu.cn", "time": "Fri Dec 23 09:15:39 2011 +0800" }, "committer": { "name": "Guan Xuetao", "email": "gxt@mprc.pku.edu.cn", "time": "Tue Jan 10 10:29:41 2012 +0800" }, "message": "rtc-puv3: irq: remove IRQF_DISABLED\n\nThis flag is deprecated, so is removed now.\n\nSigned-off-by: Yong Zhang \u003cyong.zhang@gmail.com\u003e\nSigned-off-by: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\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": "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": "acc952c1f373bf3f66cc7a10680eee1762bed40b", "tree": "de1135ffe304f4d8e53d282e5bb1bde5db04e0ae", "parents": [ "57e964e1ae9bd4f699ae1074430bcf81a9a11377", "40ba95fdf158713377d47736b1b3a9d75f4f2515" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:21:03 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:21:03 2012 -0800" }, "message": "Merge tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nCleanups on various subarchitectures\n\nCleanup patches for various ARM platforms and some of their associated\ndrivers, the bulk of these is for mach-91.\n\nArnd ended up pulling in the restart branch from Russell in order to\nfix up some simple but annoying merge conflicts.\n\n* tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)\n arm/at91: fix build of stamp9g20\n ARM: u300: delete memory.h\n MAINTAINERS: add maintainer entry for Picochip picoxcell\n ARM: picoxcell: move io mappings to common.c\n ARM: picoxcell: don\u0027t reserve irq_descs\n ARM: picoxcell: remove mach/memory.h\n ARM: at91: delete the pcontrol_g20_defconfig\n arm/tegra: Remove code that\u0027s ifndef CONFIG_ARM_GIC\n arm/tegra: remove unused defines\n arm/tegra: fix variable formatting in makefile\n ARM: davinci: vpif: move code to driver core header from platform\n ARM: at91/gpio: fix display of number of irq setuped\n ARM: at91/gpio: drop PIN_BASE\n ARM: at91/udc: use gpio_is_valid to check the gpio\n ARM: at91/ohci: use gpio_is_valid to check the gpio\n ARM: at91/nand: use gpio_is_valid to check the gpio\n ARM: at91/mmc: use gpio_is_valid to check the gpio\n ARM: at91/ide: use gpio_is_valid to check the gpio\n ARM: at91/pata: use gpio_is_valid to check the gpio\n ARM: at91/soc: use gpio_is_valid to check the gpio\n ...\n" }, { "commit": "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": "74d836c4142e5d100f8d9a1b2ee3003c2ed7109d", "tree": "29daf16ef1c8b8a0b741bd41b590351b142a4fd1", "parents": [ "ba74e80ebaf8209cb553eb2195b26302270cfa42" ], "author": { "name": "Kevin Liu", "email": "kliu5@marvell.com", "time": "Wed Jan 04 15:14:26 2012 +0800" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Mon Jan 09 01:30:12 2012 +0100" }, "message": "rtc: max8925: Add function to work as wakeup source\n\nSigned-off-by: Kevin Liu \u003ckliu5@marvell.com\u003e\nSigned-off-by: Haojian Zhuang \u003chaojian.zhuang@marvell.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "ee66e653ca7425bc8ffca4e00f19a8057cd14e4d", "tree": "e566da76e2588bc4871df677063f302213be0427", "parents": [ "83051b7287e43241ccb6adaaa92615a87274898b" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Fri Dec 02 14:16:33 2011 +0100" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Mon Jan 09 00:37:39 2012 +0100" }, "message": "mfd: Unify abx500 headers in mfd/abx500\n\nThis moves all the header files related to the abx500 family into\na common include directory below mfd. From now on we place any\nsubchip header in that directory. Headers previously in e.g.\n\u003clinux/mfd/ab8500/gpio.h\u003e get prefixed and are now e.g.\n\u003clinux/mfd/abx500/ab8500-gpio.h\u003e. The top-level abstract interface\nremains in \u003clinux/mfd/abx500.h\u003e.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "928a11ba36f999436915ea2b1eadf54301f93059", "tree": "8d7cb575d528ddd4b1165e4690401c729c1eb930", "parents": [ "237c78beb8a988453bac1993d21f025d070a0d8d", "40ba95fdf158713377d47736b1b3a9d75f4f2515" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 20:21:04 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 20:23:00 2012 +0000" }, "message": "Merge branch \u0027next/cleanup\u0027 into samsung/dt\n\nConflicts:\n\tarch/arm/mach-exynos/common.c\n\nThe common.c file gets changes from rmk/stable-devel (part of\nnext/cleanup), rmk/restart, samsung/dt and follow-on branches\nfrom the samsung tree.\n\nPulling it all together here hopefully avoids having to do\neven more conflicting merge changesets in this one file. What\na mess!\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\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": "40ba95fdf158713377d47736b1b3a9d75f4f2515", "tree": "17a3216542d1107f777fd82577c91aebbce597d6", "parents": [ "70d84a6431d732cbc4e68e72b6890cdd3865d43d", "0575fb754dbfc32a01f297e778533340a533ec68" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 11:51:28 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 11:51:28 2012 +0000" }, "message": "Merge branch \u0027depends/rmk/restart\u0027 into next/cleanup\n\nConflicts:\n\tarch/arm/mach-at91/at91cap9.c\n\tarch/arm/mach-at91/at91sam9260.c\n\tarch/arm/mach-at91/at91sam9261.c\n\tarch/arm/mach-at91/at91sam9263.c\n\tarch/arm/mach-at91/at91sam9g45.c\n\tarch/arm/mach-at91/at91sam9rl.c\n\tarch/arm/mach-exynos/cpu.c\n\tarch/arm/mach-shmobile/board-kota2.c\n\nThis resolves a bunch of conflicts between the arm-soc tree\nand changes from the arm tree that have gone upstream.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "d3d0b024348c040f0d6851e2e59fc961677d5169", "tree": "ab018edaa027ad069c54beb9cb3d0c5b5efc2198", "parents": [ "6ed23fd6c08b3ffa17c1f841098d2fa2ab3a59dd", "9d5c627323dcf0983d699d26dd486272fc98bef2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 18:03:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 18:03:30 2012 -0800" }, "message": "Merge branch \u0027amba-modalias\u0027 of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm\n\n* \u0027amba-modalias\u0027 of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:\n sound: aaci: Enable module alias autogeneration for AMBA drivers\n watchdog: sp805: Enable module alias autogeneration for AMBA drivers\n fbdev: amba: Enable module alias autogeneration for AMBA drivers\n serial: pl011: Enable module alias autogeneration for AMBA drivers\n serial: pl010: Enable module alias autogeneration for AMBA drivers\n spi: pl022: Enable module alias autogeneration for AMBA drivers\n rtc: pl031: Enable module alias autogeneration for AMBA drivers\n rtc: pl030: Enable module alias autogeneration for AMBA drivers\n mmc: mmci: Enable module alias autogeneration for AMBA drivers\n input: ambakmi: Enable module alias autogeneration for AMBA drivers\n gpio: pl061: Enable module alias autogeneration for AMBA drivers\n dmaengine: pl330: Enable module alias autogeneration for AMBA drivers\n dmaengine: pl08x: Enable module alias autogeneration for AMBA drivers\n hwrng: nomadik: Enable module alias autogeneration for AMBA drivers\n ARM: amba: Auto-generate AMBA driver module aliases during modpost\n ARM: amba: Move definition of struct amba_id to mod_devicetable.h\n" }, { "commit": "f423fc627b05f47bc9305f9661630fce30f208f9", "tree": "f2d9589bc443e99c8843a8ca18c44956d61fcf28", "parents": [ "157e8bf8b4823bfcdefa6c1548002374b61f61df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 04 07:57:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 04 07:57:22 2012 -0800" }, "message": "Revert \"rtc: Expire alarms after the time is set.\"\n\nThis reverts commit 93b2ec0128c431148b216b8f7337c1a52131ef03.\n\nThe call to \"schedule_work()\" in rtc_initialize_alarm() happens too\nearly, and can cause oopses at bootup\n\nNeil Brown explains why we do it:\n\n \"If you set an alarm in the future, then shutdown and boot again after\n that time, then you will end up with a timer_queue node which is in\n the past.\n\n When this happens the queue gets stuck. That entry-in-the-past won\u0027t\n get removed until and interrupt happens and an interrupt won\u0027t happen\n because the RTC only triggers an interrupt when the alarm is \"now\".\n\n So you\u0027ll find that e.g. \"hwclock\" will always tell you that\n \u0027select\u0027 timed out.\n\n So we force the interrupt work to happen at the start just in case.\"\n\nand has a patch that convert it to do things in-process rather than with\nthe worker thread, but right now it\u0027s too late to play around with this,\nso we just revert the patch that caused problems for now.\n\nReported-by: Sander Eikelenboom \u003clinux@eikelenboom.it\u003e\nRequested-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nRequested-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nCc: Neil Brown \u003cneilb@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "157e8bf8b4823bfcdefa6c1548002374b61f61df", "tree": "fb3918eeb8635b7ea6662ef2290dc834efc81b70", "parents": [ "f9fab10bbd768b0e5254e53a4a8477a94bfc4b96" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 03 17:32:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 03 17:32:13 2012 -0800" }, "message": "Revert \"rtc: Disable the alarm in the hardware\"\n\nThis reverts commit c0afabd3d553c521e003779c127143ffde55a16f.\n\nIt causes failures on Toshiba laptops - instead of disabling the alarm,\nit actually seems to enable it on the affected laptops, resulting in\n(for example) the laptop powering on automatically five minutes after\nshutdown.\n\nThere\u0027s a patch for it that appears to work for at least some people,\nbut it\u0027s too late to play around with this, so revert for now and try\nagain in the next merge window.\n\nSee for example\n\n\thttp://bugs.debian.org/652869\n\nReported-and-bisected-by: Andreas Friedrich \u003cafrie@gmx.net\u003e (Toshiba Tecra)\nReported-by: Antonio-M. Corbi Bellot \u003cantonio.corbi@ua.es\u003e (Toshiba Portege R500)\nReported-by: Marco Santos \u003cmarco.santos@waynext.com\u003e (Toshiba Portege Z830)\nReported-by: Christophe Vu-Brugier \u003ccvubrugier@yahoo.fr\u003e (Toshiba Portege R830)\nCc: Jonathan Nieder \u003cjrnieder@gmail.com\u003e\nRequested-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nCc: stable@kernel.org # for the versions that applied this\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "15db3e823c3246e3bd31fe454f5c8927eb85caf2", "tree": "f91811c5872ede20ec86f4256a9f60befa6b8a61", "parents": [ "d7bd1b8a6104bcdc53611689fec8715a236a22c8", "edf3ff5bac2582b57de4e7c6569fee5d7c1c0a42" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Dec 28 10:46:03 2011 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Dec 28 10:46:03 2011 +0000" }, "message": "Merge branch \u0027drivers/rtc-sa1100\u0027 into next/drivers\n\n* drivers/rtc-sa1100:\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\nConflicts:\n\tarch/arm/mach-pxa/pxa25x.c\n\tarch/arm/mach-pxa/pxa27x.c\n" }, { "commit": "7cea00657dd4daef66ad95e976d5d67ed94cb97e", "tree": "aac948c4fbc5e12c53e7c7eeb1cb11e2e9afb199", "parents": [ "42874759d7494648e42e6e0465fc9c4f3752bba4" ], "author": { "name": "Jett.Zhou", "email": "jtzhou@marvell.com", "time": "Wed Nov 30 12:26:23 2011 +0800" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Dec 28 10:42:38 2011 +0000" }, "message": "RTC: sa1100: support sa1100, pxa and mmp soc families\n\nSince the regmap of rtc on sa1100, pxa and mmp Marvell soc families are\nalmost the same, so re-arch the rtc-sa1100 to support them.\n\nSigned-off-by: Jett.Zhou \u003cjtzhou@marvell.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\nAcked-by: Robert Jarzmik \u003crobert.jarzmik@free.fr\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "42874759d7494648e42e6e0465fc9c4f3752bba4", "tree": "0bc18d7f9c551d13f1919c5d098e4bf4e6cdc093", "parents": [ "9d2d94385327f98ea69c183bb6c1d27cac49abf0" ], "author": { "name": "Jett.Zhou", "email": "jtzhou@marvell.com", "time": "Wed Nov 30 12:26:22 2011 +0800" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Dec 28 10:42:33 2011 +0000" }, "message": "RTC: sa1100: remove redundant code of setting alarm\n\nIn rtc generic interface of setting alarm, it will check the alarm time\nvalue valid or not, so rtc_periodic_alarm is redundant, remove it.\n\nSigned-off-by: Jett.Zhou \u003cjtzhou@marvell.com\u003e\nAcked-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "9d2d94385327f98ea69c183bb6c1d27cac49abf0", "tree": "4c7af3464e7cfceb600057219893ecdcc7fd7654", "parents": [ "dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50" ], "author": { "name": "Jett.Zhou", "email": "jtzhou@marvell.com", "time": "Wed Nov 30 14:29:44 2011 +0800" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Dec 28 10:42:21 2011 +0000" }, "message": "RTC: sa1100: Clean out ost register\n\nThese registers are used in old ioctl of UIE and PIE, now they are\nemulated by rtc generic code of hrtimer, so it can be removed.\n\nSigned-off-by: Jett.Zhou \u003cjtzhou@marvell.com\u003e\nAcked-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\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": "5fbd305dd2b661a243013cf444d2a32bfec2f701", "tree": "4e90099fef21c0ad7aec77d772b12a0b2094d64e", "parents": [ "a205b082189bf914959a667a5c83ea145bba3fb5", "b1b73d095084e754562961c443aa8f6587a55f8e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 20 11:42:38 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 20 11:42:38 2011 -0800" }, "message": "Merge branch \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n time/clocksource: Fix kernel-doc warnings\n rtc: m41t80: Workaround broken alarm functionality\n rtc: Expire alarms after the time is set.\n" }, { "commit": "6e5ed276374c329b93a968d640f4d26c8c05411b", "tree": "3b0d42269f0f52ea7764511de3a58b01d12bcb23", "parents": [ "d79a8869d8a4b565b12a88faeff834b09a36368c", "384703b8e6cd4c8ef08512e596024e028c91c339" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Dec 18 10:35:16 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Dec 18 10:35:16 2011 +0100" }, "message": "Merge commit \u0027v3.2-rc6\u0027 into x86/platform\n" }, { "commit": "933b9463a0ef75da681747b2dac06c1754465372", "tree": "0013765841b854c371f9981c87b3801f6d566d69", "parents": [ "c95aaeffd8a41bde48270040abe3cab8ea328787" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Sat Dec 17 17:43:40 2011 +0000" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Dec 18 09:17:02 2011 +0100" }, "message": "x86/intel config: Revamp configuration to allow for Moorestown and Medfield\n\nThis sets all up the other bits that need to be INTEL_MID\nspecific rather than Moorestown specific.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nLink: http://lkml.kernel.org/r/20111217174318.7207.91543.stgit@bob.linux.org.uk\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "02735a29d8ce882ec698803f064e17888874780c", "tree": "6a4afa3bc8b6d4334df24910a56f77adf126b0c7", "parents": [ "8d685b7f4d9c9882442bf1b492558d5f17b694fa", "3d911ad22e8405c1a333a6812e405cb1a5ae9829" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Dec 15 22:02:34 2011 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Dec 15 22:02:34 2011 -0800" }, "message": "Merge branch \u0027at91/defconfig\u0027 into next/cleanup\n" }, { "commit": "c3b79770e51ab1fd4201f3b54edf30113b9ce74f", "tree": "a37fa11f7341f765e66fa9091ea6a75e66431308", "parents": [ "93b2ec0128c431148b216b8f7337c1a52131ef03" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon Dec 12 13:57:52 2011 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Dec 13 12:26:24 2011 -0800" }, "message": "rtc: m41t80: Workaround broken alarm functionality\n\nThe m41t80 driver can read and set the alarm, but it doesn\u0027t\nseem to have a functional alarm irq.\n\nThis causes failures when the generic core sees alarm functions,\nbut then cannot use them properly for things like UIE mode.\n\nDisabling the alarm functions allows proper error reporting,\nand possible fallback to emulated modes. Once someone fixes\nthe alarm irq functionality, this can be restored.\n\nCC: stable@kernel.org\nCC: Matt Turner \u003cmattst88@gmail.com\u003e\nCC: Nico Macrionitis \u003cacrux@cruxppc.org\u003e\nCC: Atsushi Nemoto \u003canemo@mba.ocn.ne.jp\u003e\nReported-by: Matt Turner \u003cmattst88@gmail.com\u003e\nReported-by: Nico Macrionitis \u003cacrux@cruxppc.org\u003e\nTested-by: Nico Macrionitis \u003cacrux@cruxppc.org\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "93b2ec0128c431148b216b8f7337c1a52131ef03", "tree": "0782370c8c04c182e67b26414e3d4180616db94b", "parents": [ "c9c024b3f3e07d087974db4c0dc46217fff3a6c0" ], "author": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Fri Dec 09 09:39:15 2011 +1100" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Dec 13 12:26:11 2011 -0800" }, "message": "rtc: Expire alarms after the time is set.\n\nIf the alarm time programming in the rtc is ever in the past, it won\u0027t fire,\nand any other alarm will be queued after it so they won\u0027t fire either.\n\nSo any time that the alarm might be in the past, we need to trigger\nthe irq handler to ensure the old alarm is cleared and the timer queue\nis fully in the future.\n\nThis can happen:\n - when we first initialise the alarm\n - when we set the time in the rtc.\n\nso follow both of these by scheduling the timer work function.\n\nCC: stable@kernel.org\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\n[Also catch set_mmss case -jstultz]\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "2dbcd05f1e9e0932833d16dab1696176fc164b07", "tree": "737d8870a8e828c11d06c53931e329744d0cbfde", "parents": [ "1de8ad43d0048963d0a0adf14bb046340426b1e4" ], "author": { "name": "Jonghwan Choi", "email": "jhbird.choi@samsung.com", "time": "Thu Dec 08 14:34:02 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 09 07:50:28 2011 -0800" }, "message": "drivers/rtc/rtc-s3c.c: fix driver clock enable/disable balance issues\n\nIf an error occurs after the clock is enabled, the enable/disable state\ncan become unbalanced.\n\nSigned-off-by: Jonghwan Choi \u003cjhbird.choi@samsung.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nAcked-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "40c043b077c6e377c8440d71563c055d0c4f0f0a", "tree": "e0c1d672a1156d7840d3ef650ba1aa963c68e13a", "parents": [ "f14aa871c7e1e58a01bf33a562ac314fae64517c", "de28f25e8244c7353abed8de0c7792f5f883588c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 05 16:53:43 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 05 16:53:43 2011 -0800" }, "message": "Merge branch \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n clockevents: Set noop handler in clockevents_exchange_device()\n tick-broadcast: Stop active broadcast device when replacing it\n clocksource: Fix bug with max_deferment margin calculation\n rtc: Fix some bugs that allowed accumulating time drift in suspend/resume\n rtc: Disable the alarm in the hardware\n" }, { "commit": "d28bdfc5c80fb64bf50824920bf9b554732dec74", "tree": "2f2ce017d27c0094a8a1561d532f73f50a4156fe", "parents": [ "be6d4321720cd56623c1d5be311bde65c2c91229" ], "author": { "name": "Jean-Christophe PLAGNIOL-VILLARD", "email": "plagnioj@jcrosoft.com", "time": "Mon Nov 14 14:24:53 2011 +0800" }, "committer": { "name": "Jean-Christophe PLAGNIOL-VILLARD", "email": "plagnioj@jcrosoft.com", "time": "Mon Nov 28 22:50:39 2011 +0800" }, "message": "ARM: at91: make rm9200 rtc drivers soc independent\n\nswitch the rtc drivers to resource and pass it via platform_device\n\nSigned-off-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nCc: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\n" }, { "commit": "6a8943d9ec2567572fca25cf69ad45844d0141a3", "tree": "d14768e0747bd4b44fb00131c9c79713033c51c5", "parents": [ "c0afabd3d553c521e003779c127143ffde55a16f" ], "author": { "name": "Arve Hjønnevåg", "email": "arve@android.com", "time": "Tue Nov 22 18:24:51 2011 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Nov 22 19:25:56 2011 -0800" }, "message": "rtc: Fix some bugs that allowed accumulating time drift in suspend/resume\n\nThe current code checks if abs(delta_delta.tv_sec) is greater or\nequal to two before it discards the old delta value, but this can\ntrigger at close to -1 seconds since -1.000000001 seconds is stored\nas tv_sec -2 and tv_nsec 999999999 in a normalized timespec.\n\nrtc_resume had an early return check if the rtc value had not changed\nsince rtc_suspend. This effectivly stops time for the duration of the\nshort sleep. Check if sleep_time is positive after all the adjustments\nhave been applied instead since this allows the old_system adjustment\nin rtc_suspend to have an effect even for short sleep cycles.\n\nCC: stable@kernel.org\nSigned-off-by: Arve Hjønnevåg \u003carve@android.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "c0afabd3d553c521e003779c127143ffde55a16f", "tree": "5a4a93f244e2e9cbc87f24958de3e83397f978fb", "parents": [ "27c9cd7e601632b3794e1c3344d37b86917ffb43" ], "author": { "name": "Rabin Vincent", "email": "rabin.vincent@stericsson.com", "time": "Tue Nov 22 11:03:14 2011 +0100" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Nov 22 19:25:43 2011 -0800" }, "message": "rtc: Disable the alarm in the hardware\n\nCurrently, the RTC code does not disable the alarm in the hardware.\n\nThis means that after a sequence such as the one below (the files are in the\nRTC sysfs), the box will boot up after 2 minutes even though we\u0027ve\nasked for the alarm to be turned off.\n\n\t# echo $((`cat since_epoch`)+120) \u003e wakealarm\n\t# echo 0 \u003e wakealarm\n\t# poweroff\n\nFix this by disabling the alarm when there are no timers to run.\n\nCc: stable@kernel.org\nCc: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Rabin Vincent \u003crabin.vincent@stericsson.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "f5feac2a333b2813a78d5d8749fa0a97cb26acee", "tree": "4ad605185f5b7dcf053d3062ea678e2266dce339", "parents": [ "66bce5916b8d4c85876e59bb1db55071baea2680" ], "author": { "name": "Dave Martin", "email": "dave.martin@linaro.org", "time": "Wed Oct 05 15:15:22 2011 +0100" }, "committer": { "name": "Dave Martin", "email": "dave.martin@linaro.org", "time": "Tue Nov 22 10:58:32 2011 +0000" }, "message": "rtc: pl031: Enable module alias autogeneration for AMBA drivers\n\nSigned-off-by: Dave Martin \u003cdave.martin@linaro.org\u003e\n" }, { "commit": "66bce5916b8d4c85876e59bb1db55071baea2680", "tree": "2f517003d5d0f3a256fe593c92cd90d18ee80c45", "parents": [ "9f99835f1121bf81f1323b6267ea2957a179da2b" ], "author": { "name": "Dave Martin", "email": "dave.martin@linaro.org", "time": "Wed Oct 05 15:15:21 2011 +0100" }, "committer": { "name": "Dave Martin", "email": "dave.martin@linaro.org", "time": "Tue Nov 22 10:58:31 2011 +0000" }, "message": "rtc: pl030: Enable module alias autogeneration for AMBA drivers\n\nSigned-off-by: Dave Martin \u003cdave.martin@linaro.org\u003e\n" }, { "commit": "66ae45604c90f25397294099cdb214f642471327", "tree": "9ca41b6489615099e9ee5aad225f5340e7ccbcd3", "parents": [ "63c95fa414032adb56194d026c9ed054488b0783" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Wed Oct 05 22:29:47 2011 +0800" }, "committer": { "name": "Guan Xuetao", "email": "gxt@mprc.pku.edu.cn", "time": "Tue Nov 15 17:13:17 2011 +0800" }, "message": "rtc: rtc-puv3: Add __devinit and __devexit markers for probe and remove\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nAcked-by: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\n" }, { "commit": "57e6319dd61d5ca10fe8dd57bcce8c0e2c480799", "tree": "906c40cec199f96f657a1e782fdc4dfcfdc81ade", "parents": [ "f2ee442115c9b6219083c019939a9cc0c9abb2f8" ], "author": { "name": "Feng Tang", "email": "feng.tang@intel.com", "time": "Thu Nov 10 13:23:39 2011 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 11 23:58:58 2011 -0200" }, "message": "vrtc: change its year offset from 1960 to 1972\n\nReal world year equals the value in vrtc YEAR register plus an offset.\nWe used 1960 as the offset to make leap year consistent, but for a\ndevice\u0027s first use, its YEAR register is 0 and the system year will\nbe parsed as 1960 which is not a valid UNIX time and will cause many\napplications to fail mysteriously. So we use 1972 instead to fix this\nissue.\n\nUpdated patch which adds a sanity check suggested by Mathias\n\nThis isn\u0027t a change in behaviour for systems, because 1972 is the one we\nactually use. It\u0027s the old version in upstream which is out of sync with\nall devices.\n\nSigned-off-by: Feng Tang \u003cfeng.tang@intel.com\u003e\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb", "tree": "faf7ad871d87176423ff9ed1d1ba4d9c688fc23f", "parents": [ "208bca0860406d16398145ddd950036a737c3c9d", "67b84999b1a8b1af5625b1eabe92146c5eb42932" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "message": "Merge branch \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\n* \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)\n Revert \"tracing: Include module.h in define_trace.h\"\n irq: don\u0027t put module.h into irq.h for tracking irqgen modules.\n bluetooth: macroize two small inlines to avoid module.h\n ip_vs.h: fix implicit use of module_get/module_put from module.h\n nf_conntrack.h: fix up fallout from implicit moduleparam.h presence\n include: replace linux/module.h with \"struct module\" wherever possible\n include: convert various register fcns to macros to avoid include chaining\n crypto.h: remove unused crypto_tfm_alg_modname() inline\n uwb.h: fix implicit use of asm/page.h for PAGE_SIZE\n pm_runtime.h: explicitly requires notifier.h\n linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h\n miscdevice.h: fix up implicit use of lists and types\n stop_machine.h: fix implicit use of smp.h for smp_processor_id\n of: fix implicit use of errno.h in include/linux/of.h\n of_platform.h: delete needless include \u003clinux/module.h\u003e\n acpi: remove module.h include from platform/aclinux.h\n miscdevice.h: delete unnecessary inclusion of module.h\n device_cgroup.h: delete needless include \u003clinux/module.h\u003e\n net: sch_generic remove redundant use of \u003clinux/module.h\u003e\n net: inet_timewait_sock doesnt need \u003clinux/module.h\u003e\n ...\n\nFix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in\n - drivers/media/dvb/frontends/dibx000_common.c\n - drivers/media/video/{mt9m111.c,ov6650.c}\n - drivers/mfd/ab3550-core.c\n - include/linux/dmaengine.h\n" }, { "commit": "092f4c56c1927e4b61a41ee8055005f1cb437009", "tree": "616ceb54b7671ccc13922ae9e002b8b972f6e09e", "parents": [ "80c2861672bbf000f6af838656959ee937e4ee4d", "c1e2ee2dc436574880758b3836fc96935b774c32" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:07:27 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:07:27 2011 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s incoming - part two)\n\nSays Andrew:\n\n \"60 patches. That\u0027s good enough for -rc1 I guess. I have quite a lot\n of detritus to be rechecked, work through maintainers, etc.\n\n - most of the remains of MM\n - rtc\n - various misc\n - cgroups\n - memcg\n - cpusets\n - procfs\n - ipc\n - rapidio\n - sysctl\n - pps\n - w1\n - drivers/misc\n - aio\"\n\n* akpm: (60 commits)\n memcg: replace ss-\u003eid_lock with a rwlock\n aio: allocate kiocbs in batches\n drivers/misc/vmw_balloon.c: fix typo in code comment\n drivers/misc/vmw_balloon.c: determine page allocation flag can_sleep outside loop\n w1: disable irqs in critical section\n drivers/w1/w1_int.c: multiple masters used same init_name\n drivers/power/ds2780_battery.c: fix deadlock upon insertion and removal\n drivers/power/ds2780_battery.c: add a nolock function to w1 interface\n drivers/power/ds2780_battery.c: create central point for calling w1 interface\n w1: ds2760 and ds2780, use ida for id and ida_simple_get() to get it\n pps gpio client: add missing dependency\n pps: new client driver using GPIO\n pps: default echo function\n include/linux/dma-mapping.h: add dma_zalloc_coherent()\n sysctl: make CONFIG_SYSCTL_SYSCALL default to n\n sysctl: add support for poll()\n RapidIO: documentation update\n drivers/net/rionet.c: fix ethernet address macros for LE platforms\n RapidIO: fix potential null deref in rio_setup_device()\n RapidIO: add mport driver for Tsi721 bridge\n ...\n" }, { "commit": "db5cf8d1ac4ac3fa06d89345154ce20068aeb097", "tree": "005495c7dc31ab072226b076c44083a1b08da8d9", "parents": [ "43fcb81550f7a16be192b19c77a379c9b27b1585" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Wed Nov 02 13:37:56 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:58 2011 -0700" }, "message": "drivers/rtc/rtc-mc13xxx.c: move probe and remove callbacks to .init.text and .exit.text\n\nThe driver is added using platform_driver_probe(), so the callbacks can be\ndiscarded more aggessively.\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nCc: 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": "43fcb81550f7a16be192b19c77a379c9b27b1585", "tree": "b90b46aeb521d7151d55674c29efde57ebb6f174", "parents": [ "6d03d06db8881f4f9da87d5c77234b98c40a30e9" ], "author": { "name": "David Anders", "email": "danders.dev@gmail.com", "time": "Wed Nov 02 13:37:53 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:58 2011 -0700" }, "message": "rtc: add initial support for mcp7941x parts\n\nAdd initial support for the microchip mcp7941x series of real time clocks.\n\nThe mcp7941x series is generally compatible with the ds1307 and ds1337 rtc\ndevices from dallas semiconductor. minor differences include a backup\nbattery enable bit, and the polarity of the oscillator enable bit.\n\nSigned-off-by: David Anders \u003cdanders.dev@gmail.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nReviewed-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6d03d06db8881f4f9da87d5c77234b98c40a30e9", "tree": "11af7b954ec046f5de4a72cce2935a1e1aea06dc", "parents": [ "f919b9235f930e649b374a50009c6c268bd9a073" ], "author": { "name": "Jonathan Cameron", "email": "jic23@cam.ac.uk", "time": "Wed Nov 02 13:37:49 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:58 2011 -0700" }, "message": "drivers/rtc/class.c: convert idr to ida and use ida_simple_get()\n\nThis is the one use of an ida that doesn\u0027t retry on receiving -EAGAIN.\nI\u0027m assuming do so will cause no harm and may help on a rare occasion.\n\nSigned-off-by: Jonathan Cameron \u003cjic23@cam.ac.uk\u003e\nCc: 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": "3369465ed1a6a9aa9b885a6d7d8e074ecbd782da", "tree": "ac60be76e1d363caab63156c1390f1ab0c4ee96c", "parents": [ "c039aff672a540f8976770e74599d350de1805cb" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Thu Aug 18 20:11:59 2011 +0100" }, "committer": { "name": "Richard Weinberger", "email": "richard@nod.at", "time": "Wed Nov 02 14:15:41 2011 +0100" }, "message": "um: switch to use of drivers/Kconfig\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Richard Weinberger \u003crichard@nod.at\u003e\n" }, { "commit": "2113852b239ed4a93d04135372162252f9342bb6", "tree": "fcbe8506e4832862d180b6b5aefeb6809dd9d705", "parents": [ "0e648f42f24f89e24c4dcac534d8e7086c9fd559" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Fri May 27 09:57:25 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:31:28 2011 -0400" }, "message": "rtc: Add module.h to implicit users in drivers/rtc\n\nThe module.h was implicitly everywhere, but when we clean\nthat up, the implicit users will compile fail; fix them up\nin advance.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "88cee8fd77af28d414b983798dd30c8950c71e31", "tree": "dd22f35e13c9305d5ecda7297f69eb8b68ffaf61", "parents": [ "7a5caabd090b8f7d782c40fc1c048d798f2b6fd7" ], "author": { "name": "Donggeun Kim", "email": "dg77.kim@samsung.com", "time": "Wed Sep 14 16:22:19 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 14 18:09:38 2011 -0700" }, "message": "drivers/rtc/rtc-s3c.c: fix no occurrence of alarm interrupt\n\nThe driver does not generate an alarm interrupt even though a time for\nan alarm is set.\n\nThis results from disabling rtc_clk after setting the alarm time.\n\nTo generate an alarm interrupt the driver should maintain its enabled\nstate for rtc_clk the until alarm interrupt occurs. This patch permits\ngeneration of an alarm interrupt.\n\n[akpm@linux-foundation.org: make s3c_rtc_alarm_clk_lock local to s3c_rtc_alarm_clk_enable()]\nSigned-off-by: Donggeun Kim \u003cdg77.kim@samsung.com\u003e\nSigned-off-by: MyungJoo Ham \u003cmyungjoo.ham@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d4c32f355cec2647efb65e4b24e630bd2386f787", "tree": "ef9b96425d918b66ce58f0fae99d9703d526e9ca", "parents": [ "8694a1840c71fc7835595ee69139c83f7a8e5543" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Wed Sep 14 16:21:47 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 14 18:09:37 2011 -0700" }, "message": "drivers/rtc/rtc-imxdi.c needs linux/sched.h\n\nInclude linux/sched.h to fix below build error.\n\n CC drivers/rtc/rtc-imxdi.o\n drivers/rtc/rtc-imxdi.c: In function \u0027di_write_wait\u0027:\n drivers/rtc/rtc-imxdi.c:168: error: \u0027TASK_INTERRUPTIBLE\u0027 undeclared (first use in this function)\n drivers/rtc/rtc-imxdi.c:168: error: (Each undeclared identifier is reported only once\n drivers/rtc/rtc-imxdi.c:168: error: for each function it appears in.)\n drivers/rtc/rtc-imxdi.c:168: error: implicit declaration of function \u0027signal_pending\u0027\n drivers/rtc/rtc-imxdi.c:168: error: implicit declaration of function \u0027schedule_timeout\u0027\n drivers/rtc/rtc-imxdi.c: In function \u0027dryice_norm_irq\u0027:\n drivers/rtc/rtc-imxdi.c:329: error: \u0027TASK_INTERRUPTIBLE\u0027 undeclared (first use in this function)\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nCc: Baruch Siach \u003cbaruch@tkos.co.il\u003e\nCc: Wan ZongShun \u003cmcuos.com@gmail.com\u003e\nCc: 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": "79016f648872549392d232cd648bd02298c2d2bb", "tree": "8b3f435b7ff3633b0a82313a1bb12d052f36c6b7", "parents": [ "e81b693c0104d6a767f998ee5a2e00b5acbbcd18", "486257130873a2172d8eac2c182f7e578465bdd0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 07 13:03:48 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 07 13:03:48 2011 -0700" }, "message": "Merge branch \u0027timers-fixes-for-linus\u0027 of git://tesla.tglx.de/git/linux-2.6-tip\n\n* \u0027timers-fixes-for-linus\u0027 of git://tesla.tglx.de/git/linux-2.6-tip:\n rtc: twl: Fix registration vs. init order\n rtc: Initialized rtc_time-\u003etm_isdst\n rtc: Fix RTC PIE frequency limit\n rtc: rtc-twl: Remove lockdep related local_irq_enable()\n rtc: rtc-twl: Switch to using threaded irq\n rtc: ep93xx: Fix \u0027rtc\u0027 may be used uninitialized warning\n alarmtimers: Avoid possible denial of service with high freq periodic timers\n alarmtimers: Memset itimerspec passed into alarm_timer_get\n alarmtimers: Avoid possible null pointer traversal\n" }, { "commit": "7e72c686347562b4a275c97b4bdd7a79c1f23c65", "tree": "02d26d0499a1510efa3e15ff57046ad35955f84c", "parents": [ "a7402deb324f62106566f5a95199a54c41e200ef" ], "author": { "name": "Todd Poynor", "email": "toddpoynor@google.com", "time": "Wed Aug 10 20:20:36 2011 -0700" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Fri Aug 26 17:26:54 2011 -0700" }, "message": "rtc: twl: Fix registration vs. init order\n\nOnly register as an RTC device after the hardware has been\nsuccessfully initialized. The RTC class driver will call\nback to this driver to read a pending alarm, and other\ndrivers watching for new devices on the RTC class may\nread the RTC time upon registration. Such access might\noccur while the RTC is stopped, prior to clearing\npending alarms, etc.\n\nThe new ordering also avoids leaving the platform\ndevice drvdata set to an unregistered struct rtc_device *\non probe errors.\n\nSigned-off-by: Todd Poynor \u003ctoddpoynor@google.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "a7402deb324f62106566f5a95199a54c41e200ef", "tree": "0eafe76a936eaa9f5391988d2a0021b3d0907dbb", "parents": [ "938f97bcf1bdd1b681d5d14d1d7117a2e22d4434" ], "author": { "name": "Mike Waychison", "email": "mikew@google.com", "time": "Fri Aug 12 21:04:30 2011 +0000" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Fri Aug 26 17:26:35 2011 -0700" }, "message": "rtc: Initialized rtc_time-\u003etm_isdst\n\nEven though the Linux kernel does not use the tm_isdst field, it is\nexposed as part of the ABI. This field can accidentally be left\ninitialized, which is why we currently memset buffers returned to\nuserland in rtc_read_time.\n\nThere is a case however where the field can return garbage from the\nstack though when using the RTC_ALM_READ ioctl on the rtc device. This\nioctl invokes rtc_read_alarm, which is careful to memset the rtc_wkalrm\nbuffer that is copied to userland, but it then uses a struct copy to\nassign to alarm-\u003etime given the return value from rtc_ktime_to_tm().\n\nrtc_ktime_to_tm() is implemented by calling rtc_time_to_tm using a\nderivative seconds counds from ktime, but rtc_time_to_tm does not assign\na value to -\u003etm_isdst. This results in garbage from rtc_ktime_to_tm()\u0027s\nframe ending up being copied out to userland as part of the returned\nrtc_wkalrm.\n\nFix this by initializing rtc_time-\u003etm_isdst to 0 in rtc_time_to_tm.\n\nSigned-off-by: Mike Waychison \u003cmikew@google.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "62d1760180c84cba68cc83696fa0bde0593007bd", "tree": "67aac33c82bec7cc50034374c58b7ef1f5bd38a2", "parents": [ "4e8896cde182b4eab6f2d0af9b6eef87720fae0d" ], "author": { "name": "MyungJoo Ham", "email": "myungjoo.ham@samsung.com", "time": "Thu Aug 25 15:59:24 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 25 18:51:00 2011 -0700" }, "message": "drivers/rtc/rtc-s3c.c: allow multiple open / allow no-ioctl-open\u0027ed rtc to have irq.\n\nThe previous rtc-s3c had two issues related with its IRQ.\n\n1. Users cannot open rtc multiple times because an open operation\n calls request_irq on the same IRQ. (e.g., two user processes wants to\n open and read RTC time from rtc-s3c at the same time)\n\n2. If alarm is set and no one has the rtc opened with filesystem\n (either the alarm is set by kernel/boot-loader or user set an alarm and\n closed rtc dev file), the pending bit is not cleared and no further\n interrupt is invoked. When the alarm is used by the system itself such\n as a resume from suspend-to-RAM or other Low-power modes/idle, this is\n a critical issue.\n\nThis patch mitigates these issues by calling request_irq at probe and\nfree_irq at remove.\n\nSigned-off-by: MyungJoo Ham \u003cmyungjoo.ham@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nAcked-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Changhwan Youn \u003cchaos.youn@samsung.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4e8896cde182b4eab6f2d0af9b6eef87720fae0d", "tree": "868568e19734b88b810eb9f80c4bd42d5c406e8e", "parents": [ "1424e21f66f4c51c31ba6ac188df46b43f51556b" ], "author": { "name": "MyungJoo Ham", "email": "myungjoo.ham@samsung.com", "time": "Thu Aug 25 15:59:22 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 25 18:50:43 2011 -0700" }, "message": "drivers/rtc/rtc-s3c.c: correct debug messages\n\nRTC-S3C used to print out debug messages incorrectly. This patch\ncorrects incorrect outputs. (undecoded bcd numbers, incorrectly decoded\nregister values)\n\nThis patch affects the pr-debug messages only.\n\nSigned-off-by: MyungJoo Ham \u003cmyungjoo.ham@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nAcked-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Changhwan Youn \u003cchaos.youn@samsung.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6cac95296034bed7b2716d5f4e417a26a618da94", "tree": "1a405f211c64f20359e42b3783d0487647da9822", "parents": [ "2da9f365fc401b79627bc7be56d8a2b4ee9b390b", "6e7a333eaa522ef73be01caec7a01521490aaf00" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 17 10:28:33 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 17 10:28:33 2011 -0700" }, "message": "Merge branch \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n rtc: Limit RTC PIE frequency\n rtc: Fix hrtimer deadlock\n rtc: Handle errors correctly in rtc_irq_set_state()\n\nFixup trivial conflicts in drivers/rtc/interface.c due to slightly\ntrivially versions of the same patch coming in two different ways.\n" }, { "commit": "938f97bcf1bdd1b681d5d14d1d7117a2e22d4434", "tree": "5e8e46091aa3445473527533d1e25108252be736", "parents": [ "34d623d11316cb69f9e8cc5eb50d3792b5c302b6" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Fri Jul 22 09:12:51 2011 +0000" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Wed Aug 10 15:55:12 2011 -0700" }, "message": "rtc: Fix RTC PIE frequency limit\n\nThomas earlier submitted a fix to limit the RTC PIE freq, but\npicked 5000Hz out of the air. Willy noticed that we should\ninstead use the 8192Hz max from the rtc man documentation.\n\nCc: Willy Tarreau \u003cw@1wt.eu\u003e\nCc: stable@kernel.org\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "34d623d11316cb69f9e8cc5eb50d3792b5c302b6", "tree": "f2062be0fabe081dd775dcf586b7367587363f89", "parents": [ "dec35d19c4ec65b94df3b27b6e373f0d48c9cd32" ], "author": { "name": "Sebastian Reichel", "email": "sre@debian.org", "time": "Tue May 31 08:51:39 2011 +0000" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Wed Aug 10 15:54:26 2011 -0700" }, "message": "rtc: rtc-twl: Remove lockdep related local_irq_enable()\n\nNow that the irq is properly threaded (due to it needing i2c access)\nwe should also remove the local_irq_enable() call in twl_rtc_interrupt.\nTesting this with Pandaboard, the RTC is still working.\n\n[Reworked commit message -jstultz]\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "dec35d19c4ec65b94df3b27b6e373f0d48c9cd32", "tree": "9711a20214d7308cd4662f9354e52a0bdcdc8ca5", "parents": [ "bf6ed027bcc93f8d54d321fe87f0434b25699eb1" ], "author": { "name": "Ilkka Koskinen", "email": "ilkka.koskinen@nokia.com", "time": "Wed Mar 16 06:07:14 2011 +0000" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Wed Aug 10 15:54:25 2011 -0700" }, "message": "rtc: rtc-twl: Switch to using threaded irq\n\nThe driver is accessing to i2c bus in interrupt handler.\nTherefore, it should use threaded irq.\n\nSigned-off-by: Ilkka Koskinen \u003cilkka.koskinen@nokia.com\u003e\nAcked-by: Balaji T K \u003cbalajitk@ti.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "bf6ed027bcc93f8d54d321fe87f0434b25699eb1", "tree": "d4a4a0d65edd98eb64d7b4cde72098fdbb21c295", "parents": [ "322a8b034003c0d46d39af85bf24fee27b902f48" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Wed Aug 10 21:11:26 2011 +0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Wed Aug 10 15:54:24 2011 -0700" }, "message": "rtc: ep93xx: Fix \u0027rtc\u0027 may be used uninitialized warning\n\ncommit 92d921c5d \"rtc: ep93xx: Initialize drvdata before registering device\"\nensures the drvdata is initialized prior to registering the rtc device.\nBut it set the drvdata to an uninitialized pointer.\nThus calling platform_get_drvdata in ep93xx_rtc_remove does not get correct address.\n\nThis patch fixes below warning by adding struct rtc_device *rtc to struct ep93xx_rtc.\nThen set platform drvdata to ep93xx_rtc instead of rtc.\n\n CC drivers/rtc/rtc-ep93xx.o\ndrivers/rtc/rtc-ep93xx.c: In function \u0027ep93xx_rtc_probe\u0027:\ndrivers/rtc/rtc-ep93xx.c:154: warning: \u0027rtc\u0027 may be used uninitialized in this function\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "12b3e038e5bb4860c17d001e92a6fa9964c0a7b9", "tree": "73bed0f33454932de3bc1d9aa49cc255a4f072fb", "parents": [ "dd48c085c1cdf9446f92826f1fd451167fb6c2fd" ], "author": { "name": "Daniel Glöckner", "email": "dg@emlix.com", "time": "Wed Aug 03 16:21:02 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 03 14:25:20 2011 -1000" }, "message": "rtc-omap: fix initialization of control register\n\nAs the comment explains, the intention of the code is to clear the\nOMAP_RTC_CTRL_MODE_12_24 bit, but instead it only clears the\nOMAP_RTC_CTRL_SPLIT and OMAP_RTC_CTRL_AUTO_COMP bits, which should be\nkept. OMAP_RTC_CTRL_DISABLE, OMAP_RTC_CTRL_SET_32_COUNTER,\nOMAP_RTC_CTRL_TEST, and OMAP_RTC_CTRL_ROUND_30S are also better off\nbeing cleared.\n\nSigned-off-by: Daniel Glöckner \u003cdg@emlix.com\u003e\nCc: 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": "b830ac1d9a2262093bb0f3f6a2fd2a1c8278daf5", "tree": "580f61a7a8a621792e8ac48d2ec4a9721165eecd", "parents": [ "431e2bcc371016824f419baa745f82388258f3ee" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Jul 26 16:08:20 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:42 2011 -0700" }, "message": "rtc: fix hrtimer deadlock\n\nBen reported a lockup related to rtc. The lockup happens due to:\n\nCPU0 CPU1\n\nrtc_irq_set_state()\t\t\t __run_hrtimer()\n spin_lock_irqsave(\u0026rtc-\u003eirq_task_lock) rtc_handle_legacy_irq();\n\t\t\t\t\t spin_lock(\u0026rtc-\u003eirq_task_lock);\n hrtimer_cancel()\n while (callback_running);\n\nSo the running callback never finishes as it\u0027s blocked on\nrtc-\u003eirq_task_lock.\n\nUse hrtimer_try_to_cancel() instead and drop rtc-\u003eirq_task_lock while\nwaiting for the callback. Fix this for both rtc_irq_set_state() and\nrtc_irq_set_freq().\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nReported-by: Ben Greear \u003cgreearb@candelatech.com\u003e\nCc: John Stultz \u003cjohn.stultz@linaro.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "431e2bcc371016824f419baa745f82388258f3ee", "tree": "11ed612c73773e5e61160efa6ff5f0c3efe5c936", "parents": [ "2c4f57d12df7696d65b0247bfd57fd082a7719e6" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Jul 26 16:08:19 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:42 2011 -0700" }, "message": "rtc: limit frequency\n\nDue to the hrtimer self rearming mode a user can DoS the machine simply\nbecause it\u0027s starved by hrtimer events.\n\nThe RTC hrtimer is self rearming. We really need to limit the frequency\nto something sensible.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: John Stultz \u003cjohn.stultz@linaro.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Ben Greear \u003cgreearb@candelatech.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2c4f57d12df7696d65b0247bfd57fd082a7719e6", "tree": "920060fbbbc18643711e61526be4040e57118145", "parents": [ "b45d59fb92f60c9c3cda01355d42b907b863e47a" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Jul 26 16:08:18 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:41 2011 -0700" }, "message": "rtc: handle errors correctly in rtc_irq_set_state()\n\nThe code checks the correctness of the parameters, but unconditionally\narms/disarms the hrtimer.\n\nThe result is that a random task might arm/disarm rtc timer and surprise\nthe real owner by either generating events or by stopping them.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: John Stultz \u003cjohn.stultz@linaro.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Ben Greear \u003cgreearb@candelatech.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6e7a333eaa522ef73be01caec7a01521490aaf00", "tree": "76e9ffac58da9bc22327a38ea5e40fc5aa18c530", "parents": [ "3c8bb90efb6e3105206e4aaa9127395feeda5492" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Jul 22 09:12:51 2011 +0000" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Jul 26 14:50:01 2011 -0700" }, "message": "rtc: Limit RTC PIE frequency\n\nThe RTC pie hrtimer is self rearming. We really need to limit the\nfrequency to something sensible. Thus limit it to the 8192Hz max\nvalue from the rtc man documentation\n\nCc: Willy Tarreau \u003cw@1wt.eu\u003e\nCc: stable@kernel.org\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n[jstultz: slightly reworked to use RTC_MAX_FREQ value]\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "3c8bb90efb6e3105206e4aaa9127395feeda5492", "tree": "9ff9771503c219677671bea7f4b2740661d1c5e9", "parents": [ "53cc2820acbdbcc768675bfaff321f3a8680a317" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Jul 22 09:12:51 2011 +0000" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Jul 26 14:49:59 2011 -0700" }, "message": "rtc: Fix hrtimer deadlock\n\nBen reported a lockup related to rtc. The lockup happens due to:\n\nCPU0 CPU1\n\nrtc_irq_set_state()\t\t\t __run_hrtimer()\n spin_lock_irqsave(\u0026rtc-\u003eirq_task_lock) rtc_handle_legacy_irq();\n\t\t\t\t\t spin_lock(\u0026rtc-\u003eirq_task_lock);\n hrtimer_cancel()\n while (callback_running);\n\nSo the running callback never finishes as it\u0027s blocked on\nrtc-\u003eirq_task_lock.\n\nUse hrtimer_try_to_cancel() instead and drop rtc-\u003eirq_task_lock while\nwaiting for the callback. Fix this for both rtc_irq_set_state() and\nrtc_irq_set_freq().\n\nCc: stable@kernel.org\nReported-by: Ben Greear \u003cgreearb@candelatech.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "53cc2820acbdbcc768675bfaff321f3a8680a317", "tree": "b0070f1ace60aeed05a30000f277ac9cd29e222a", "parents": [ "ef68c8f87ed13f65df867dddf36c0e185b27b942" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Jul 22 09:12:50 2011 +0000" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Jul 26 14:49:57 2011 -0700" }, "message": "rtc: Handle errors correctly in rtc_irq_set_state()\n\nIn rtc_irq_set_state, the code checks the correctness of the parameters,\nbut then goes on to unconditionally arms/disarms the hrtimer. Thus a\nrandom task might arm/disarm rtc timer and surprise the real owner by\neither generating events or by stopping them.\n\nCc: stable@kernel.org\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "45b583b10a8b438b970e95a7d1d4db22c9e35004", "tree": "14fa481598289df0459580c582b48a9d95db51f6", "parents": [ "154dd78d30b56ffb8b447f629bfcceb14150e5c4", "f19da2ce8ef5e49b8b8ea199c3601dd45d71b262" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 21:00:19 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 21:00:19 2011 -0700" }, "message": "Merge \u0027akpm\u0027 patch series\n\n* Merge akpm patch series: (122 commits)\n drivers/connector/cn_proc.c: remove unused local\n Documentation/SubmitChecklist: add RCU debug config options\n reiserfs: use hweight_long()\n reiserfs: use proper little-endian bitops\n pnpacpi: register disabled resources\n drivers/rtc/rtc-tegra.c: properly initialize spinlock\n drivers/rtc/rtc-twl.c: check return value of twl_rtc_write_u8() in twl_rtc_set_time()\n drivers/rtc: add support for Qualcomm PMIC8xxx RTC\n drivers/rtc/rtc-s3c.c: support clock gating\n drivers/rtc/rtc-mpc5121.c: add support for RTC on MPC5200\n init: skip calibration delay if previously done\n misc/eeprom: add eeprom access driver for digsy_mtc board\n misc/eeprom: add driver for microwire 93xx46 EEPROMs\n checkpatch.pl: update $logFunctions\n checkpatch: make utf-8 test --strict\n checkpatch.pl: add ability to ignore various messages\n checkpatch: add a \"prefer __aligned\" check\n checkpatch: validate signature styles and To: and Cc: lines\n checkpatch: add __rcu as a sparse modifier\n checkpatch: suggest using min_t or max_t\n ...\n\nDid this as a merge because of (trivial) conflicts in\n - Documentation/feature-removal-schedule.txt\n - arch/xtensa/include/asm/uaccess.h\nthat were just easier to fix up in the merge than in the patch series.\n" }, { "commit": "e57ee01750c4954fd0b5e3c6109cd4b870880eb9", "tree": "73356d5604cc10ca8e6e86616276da4531984004", "parents": [ "8f6b0dd369868559b384a66aa17512ae5aae2d9b" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Mon Jul 25 17:13:34 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 20:57:17 2011 -0700" }, "message": "drivers/rtc/rtc-tegra.c: properly initialize spinlock\n\nUsing __SPIN_LOCK_UNLOCKED for a dynamically allocated lock is wrong and\nbreaks the build with PREEMPT_RT_FULL.\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nCc: Andrew Chew \u003cachew@nvidia.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8f6b0dd369868559b384a66aa17512ae5aae2d9b", "tree": "b98bcc40d158d96fe30af93e5bdede28fbeac77d", "parents": [ "9a9a54ad7aa2c7420c96c6fd33538f55d81775cb" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Mon Jul 25 17:13:34 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 20:57:17 2011 -0700" }, "message": "drivers/rtc/rtc-twl.c: check return value of twl_rtc_write_u8() in twl_rtc_set_time()\n\nWe forget to save the return value of the call to\ntwl_rtc_write_u8(save_control, REG_RTC_CTRL_REG); in \u0027ret\u0027, making the\ntest of \u0027ret \u003c 0\u0027 dead code since \u0027ret\u0027 then couldn\u0027t possibly have\nchanged since the last test just a few lines above. It also makes us not\ndetect failures from that specific twl_rtc_write_u8() call.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Alexandre Rusev \u003csource@mvista.com\u003e\nCc: \"George G. Davis\" \u003cgdavis@mvista.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9a9a54ad7aa2c7420c96c6fd33538f55d81775cb", "tree": "4ffc127f3ea38c210f37d75b8eb41d82cd4398ce", "parents": [ "cefe4fbbaab8e20a7581a187db82d33c1e3320c0" ], "author": { "name": "Anirudh Ghayal", "email": "aghayal@codeaurora.org", "time": "Mon Jul 25 17:13:33 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 20:57:17 2011 -0700" }, "message": "drivers/rtc: add support for Qualcomm PMIC8xxx RTC\n\nAdd support for PMIC8xxx based RTC. PMIC8xxx is Qualcomm\u0027s power\nmanagement IC that internally houses an RTC module. This driver\ncommunicates with the PMIC module over SSBI bus.\n\n[akpm@linux-foundation.org: cosmetic tweaks]\nAcked-by: Wan ZongShun \u003cmcuos.com@gmail.com\u003e\nReviewed-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nSigned-off-by: Anirudh Ghayal \u003caghayal@codeaurora.org\u003e\nSigned-off-by: Ashay Jaiswal \u003cashayj@codeaurora.org\u003e\nCc: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nCc: Wan ZongShun \u003cmcuos.com@gmail.com\u003e\nCc: 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": "cefe4fbbaab8e20a7581a187db82d33c1e3320c0", "tree": "a40203a65c87c09136a38d3927c643a119364f7f", "parents": [ "955dbea3c7133d3ccfaa79c7eba1244c1de42865" ], "author": { "name": "Donggeun Kim", "email": "dg77.kim@samsung.com", "time": "Mon Jul 25 17:13:32 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 20:57:17 2011 -0700" }, "message": "drivers/rtc/rtc-s3c.c: support clock gating\n\nAdd support for clock gating. Power consumption can be reduced by setting\nrtc_clk disabled state except for when RTC related registers are accessed.\n\nSigned-off-by: Donggeun Kim \u003cdg77.kim@samsung.com\u003e\nSigned-off-by: MyungJoo Ham \u003cmyungjoo.ham@samsung.com\u003e\nSigned-off-by: KyungMin Park \u003ckyungmin.park@samsung.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Ben Dooks \u003cben@fluff.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "955dbea3c7133d3ccfaa79c7eba1244c1de42865", "tree": "43c62ac01d5b620553b199a6b6a1d8c125aa8975", "parents": [ "7afe1845dd1e7c90828c942daed7e57ffa7c38d6" ], "author": { "name": "Dmitry Eremin-Solenikov", "email": "dbaryshkov@gmail.com", "time": "Mon Jul 25 17:13:30 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 20:57:17 2011 -0700" }, "message": "drivers/rtc/rtc-mpc5121.c: add support for RTC on MPC5200\n\nMPC5200B contains a limited version of RTC from MPC5121. Add support for\nthe RTC on that CPU.\n\nSigned-off-by: Dmitry Eremin-Solenikov \u003cdbaryshkov@gmail.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Anatolij Gustschin \u003cagust@denx.de\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d3ec4844d449cf7af9e749f73ba2052fb7b72fc2", "tree": "c515913e85f7e50878c83da2a88bc5a7269d087c", "parents": [ "0003230e8200699860f0b10af524dc47bf8aecad", "df2e301fee3c2c2a87592151397ad7699bb14c37" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 13:56:39 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 13:56:39 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)\n fs: Merge split strings\n treewide: fix potentially dangerous trailing \u0027;\u0027 in #defined values/expressions\n uwb: Fix misspelling of neighbourhood in comment\n net, netfilter: Remove redundant goto in ebt_ulog_packet\n trivial: don\u0027t touch files that are removed in the staging tree\n lib/vsprintf: replace link to Draft by final RFC number\n doc: Kconfig: `to be\u0027 -\u003e `be\u0027\n doc: Kconfig: Typo: square -\u003e squared\n doc: Konfig: Documentation/power/{pm \u003d\u003e apm-acpi}.txt\n drivers/net: static should be at beginning of declaration\n drivers/media: static should be at beginning of declaration\n drivers/i2c: static should be at beginning of declaration\n XTENSA: static should be at beginning of declaration\n SH: static should be at beginning of declaration\n MIPS: static should be at beginning of declaration\n ARM: static should be at beginning of declaration\n rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check\n Update my e-mail address\n PCIe ASPM: forcedly -\u003e forcibly\n gma500: push through device driver tree\n ...\n\nFix up trivial conflicts:\n - arch/arm/mach-ep93xx/dma-m2p.c (deleted)\n - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)\n - drivers/net/r8169.c (just context changes)\n" }, { "commit": "52de84f3f3f407013a7f7872601e7a43a505abd3", "tree": "cfd7ac2fd9a928d4855eb90be06d25947f90f1ef", "parents": [ "112ec469663e09ffc815761254b52f3ca787ce83", "ef68c8f87ed13f65df867dddf36c0e185b27b942" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 16:52:39 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 16:52:39 2011 -0700" }, "message": "Merge branch \u0027timers-rtc-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-rtc-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Serialize EFI time accesses on rtc_lock\n x86: Serialize SMP bootup CMOS accesses on rtc_lock\n rtc: stmp3xxx: Remove UIE handlers\n rtc: stmp3xxx: Get rid of mach-specific accessors\n rtc: stmp3xxx: Initialize drvdata before registering device\n rtc: stmp3xxx: Port stmp-functions to mxs-equivalents\n rtc: stmp3xxx: Restore register definitions\n rtc: vt8500: Use define instead of hardcoded value for status bit\n" }, { "commit": "112ec469663e09ffc815761254b52f3ca787ce83", "tree": "18a7d2300dc10b7c2c994107681dffc927589701", "parents": [ "a99a7d1436f9375662f35ccac8f1a1e1b0302a11", "cbaa51524b3224813814607177a00c350ee35d12" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 16:52:18 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 16:52:18 2011 -0700" }, "message": "Merge branch \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n time: Fix stupid KERN_WARN compile issue\n rtc: Avoid accumulating time drift in suspend/resume\n time: Avoid accumulating time drift in suspend/resume\n time: Catch invalid timespec sleep values in __timekeeping_inject_sleeptime\n" }, { "commit": "b7e9c223be8ce335e30f2cf6ba588e6a4092275c", "tree": "2d1e3b75606abc18df7ad65e51ac3f90cd68b38d", "parents": [ "c172d82500a6cf3c32d1e650722a1055d72ce858", "e3bbfa78bab125f58b831b5f7f45b5a305091d72" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jul 11 14:15:48 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jul 11 14:15:55 2011 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nSync with Linus\u0027 tree to be able to apply pending patches that\nare based on newer code already present upstream.\n" }, { "commit": "7e794cb7e36ccdb8c44b8ca7738720625b7aa2da", "tree": "4092b4402f32813f2554481752e2d45faedf31c1", "parents": [ "b5167159d4341d408ef6b941975f2fe8973b2a94" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Wed May 25 12:56:53 2011 +0200" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Fri Jul 01 18:09:57 2011 -0700" }, "message": "rtc: stmp3xxx: Remove UIE handlers\n\nThe RTC core handles UIE since 6610e08 (RTC: Rework RTC code to use\ntimerqueue for events), so remove the specific interrupt in this driver.\nTo make it work at all, enable interrupts in set_alarm() if needed. Drop\nIRQF_DISABLED which is deprecated, while we are here. Finally, add my\ncopyright after all these changes.\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nTested-by: Shawn Guo \u003cshawn.guo@freescale.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "b5167159d4341d408ef6b941975f2fe8973b2a94", "tree": "e5424d893af19f51bdd6dbb8167c68c7eab36e04", "parents": [ "a91d2bab355f3a5caa767d7316f80422bfcd2ad6" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Wed May 25 12:56:52 2011 +0200" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Fri Jul 01 18:09:56 2011 -0700" }, "message": "rtc: stmp3xxx: Get rid of mach-specific accessors\n\nReplace the accessors with standard readl/writel to remove their\nplatform-dependency. Also, drop __raw_(read|write)l-accessors while we\nare here.\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nTested-by: Shawn Guo \u003cshawn.guo@freescale.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "a91d2bab355f3a5caa767d7316f80422bfcd2ad6", "tree": "d195bca36a8b606c58280011ef06cd6c5ec616bc", "parents": [ "46b21218145ecef0936eb4338a9e0ffef84f00cf" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Wed May 25 12:56:51 2011 +0200" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Fri Jul 01 18:09:55 2011 -0700" }, "message": "rtc: stmp3xxx: Initialize drvdata before registering device\n\nCommit f44f7f96a20 (\"RTC: Initialize kernel state from RTC\") uncovered\nan issue in a number of RTC drivers, where the drivers call\nrtc_device_register before initializing the device or platform drvdata.\n\nThis frequently results in null pointer dereferences when the\nrtc_device_register immediately makes use of the rtc device, calling\nrtc_read_alarm.\n\nThe solution is to ensure the drvdata is initialized prior to registering\nthe rtc device.\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nTested-by: Shawn Guo \u003cshawn.guo@freescale.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "46b21218145ecef0936eb4338a9e0ffef84f00cf", "tree": "8a69926e13fb0f8358ca5ad8bc0a7fc5440d6a0a", "parents": [ "47eac337cd87464b90d0ad2eb2a060036a95b649" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Wed May 25 12:56:50 2011 +0200" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Fri Jul 01 18:09:44 2011 -0700" }, "message": "rtc: stmp3xxx: Port stmp-functions to mxs-equivalents\n\nThe stmp3xxx driver used to include functions from a stmp-specific\ninclude. Because of consolidation, plat-stmp has now been removed and\nmerged with the compatible mach-mxs.\n\nUse the apropriate mxs-functions for transition. The accessors will be\nconverted to readl/writel in a later patch.\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nTested-by: Shawn Guo \u003cshawn.guo@freescale.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "47eac337cd87464b90d0ad2eb2a060036a95b649", "tree": "84db345a5b36c28d62cab980e1a1fb81c43c30a9", "parents": [ "07187ee13f2b4ba183d4a4832ea153dbb2e030d3" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Wed May 25 12:56:49 2011 +0200" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Fri Jul 01 18:09:34 2011 -0700" }, "message": "rtc: stmp3xxx: Restore register definitions\n\nThe stmp3xxx driver used to include register names from a stmp-specific\ninclude. Because of consolidation, plat-stmp has now been removed and\nmerged with the compatible mach-mxs. Restore the register names directly\nin the driver and rename them to be specific to this driver.\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nTested-by: Shawn Guo \u003cshawn.guo@freescale.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "07187ee13f2b4ba183d4a4832ea153dbb2e030d3", "tree": "4fe700d73c43c6ded70f82bf73d73f398c81ace5", "parents": [ "daf54f1f363a61c618662ef66d4bf09d2b090941" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Wed Jun 22 23:20:14 2011 +0200" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Fri Jul 01 17:59:36 2011 -0700" }, "message": "rtc: vt8500: Use define instead of hardcoded value for status bit\n\nFixes the vt8500 driver to use a define value for the isr\nis-alarm bit.\n\nCc: Alexey Charkov \u003calchark@gmail.com\u003e\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "31c1771cdbf0edea96e109e24dae387d331b6d96", "tree": "90086ac87189feb25f4549afc2c0980ddd6b163f", "parents": [ "d9d90e5eb70e09903dadff42099b6c948f814050" ], "author": { "name": "Priyanka Jain", "email": "Priyanka.Jain@freescale.com", "time": "Mon Jun 27 16:18:04 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:12 2011 -0700" }, "message": "drivers/rtc/rtc-ds1307.c: add support for RTC device pt7c4338\n\nPT7C4338 chip is being manufactured by Pericom Technology Inc. It is a\nserial real-time clock which provides:\n\n1) Low-power clock/calendar.\n2) Programmable square-wave output.\n\nIt has 56 bytes of nonvolatile RAM. Its register set is same as that of\nrtc device: DS1307.\n\nSigned-off-by: Priyanka Jain \u003cPriyanka.Jain@freescale.com\u003e\nAcked-by: Timur Tabi \u003ctimur@freescale.com\u003e\nReviewed-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "03ad2d501e7189245bf6bf9dfc2a30511dd50602", "tree": "aea77f0264d8d634085e9da892c6460876d8240b", "parents": [ "e08f6d4131ab964420f0bcabecc68d75fb49df79" ], "author": { "name": "Alexey Charkov", "email": "alchark@gmail.com", "time": "Wed Jun 22 23:20:13 2011 +0200" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Jun 23 16:11:39 2011 -0700" }, "message": "rtc: vt8500: Fix build error \u0026 cleanup rtc_class_ops-\u003eupdate_irq_enable()\n\nNow that the generic code handles UIE mode irqs via periodic\nalarm interrupts, no one calls the\nrtc_class_ops-\u003eupdate_irq_enable() method anymore.\n\nFurther the rtc_class_ops doesn\u0027t have a update_irq_enable element\nanymore, so this causes a build error.\n\nThis patch removes the driver hooks and implementations of\nupdate_irq_enable and the associated setup.\n\n[wsa: updated commit-message and removed update_irq_enable-function, too]\n[jstultz: improve commit message, clarifying build issue]\nSigned-off-by: Alexey Charkov \u003calchark@gmail.com\u003e\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "3dcad5ff08f65ae30832220a0e0ee2eac3502a1a", "tree": "babf46c6533cf0576fa6b46992506250298cc73f", "parents": [ "cb33217b1b2523895eb328a0b13fb3b1c4000969" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Fri May 27 11:33:18 2011 -0700" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Jun 21 16:55:39 2011 -0700" }, "message": "rtc: Avoid accumulating time drift in suspend/resume\n\nBecause the RTC interface is only a second granular interface,\neach time we read from the RTC for suspend/resume, we introduce a\nhalf second (on average) of error.\n\nIn order to avoid this error accumulating as the system is suspended\nover and over, this patch measures the time delta between the RTC\nand the system CLOCK_REALTIME.\n\nIf the delta is less then 2 seconds from the last suspend, we compensate\nby using the previous time delta (keeping it close). If it is larger\nthen 2 seconds, we assume the clock was set or has been changed, so we\ndo no correction and update the delta.\n\nNote: If NTP is running, ths could seem to \"fight\" with the NTP corrected\ntime, where as if the system time was off by 1 second, and NTP slewed the\nvalue in, a suspend/resume cycle could undo this correction, by trying to\nrestore the previous offset from the RTC. However, without this patch,\nsince each read could cause almost a full second worth of error, its\npossible to get almost 2 seconds of error just from the suspend/resume\ncycle alone, so this about equal to any offset added by the compensation.\n\nFurther on systems that suspend/resume frequently, this should keep time\ncloser then NTP could compensate for if the errors were allowed to\naccumulate.\n\nCredits to Arve Hjønnevåg for suggesting this solution.\n\nThis patch also improves some of the variable names and adds more clear\ncomments.\n\nCC: Arve Hjønnevåg \u003carve@android.com\u003e\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "80dadf86d607bc5f25cc384ac590ef8b49ae523a", "tree": "65a5d75b5e73fea871d335c9fbcb9decbeb0a880", "parents": [ "c78a9b9b8e36b8de302eddbe7a1688af3d9650ff", "f6509b5f002a69c299b04d32a876d051a0b52f68" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 13 10:47:04 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 13 10:47:04 2011 -0700" }, "message": "Merge branch \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n rtc: Staticize non-exported __rtc_set_alarm()\n rtc: Fix ioctl error path return\n ptp: Fix some locking bugs in ptp_read()\n ptp: Return -EFAULT on copy_to_user() errors\n" }, { "commit": "28f65c11f2ffb3957259dece647a24f8ad2e241b", "tree": "6b7621d09d10df89eedd908d4506fb9f457a909f", "parents": [ "140a1ef2f91a00e1d25f0878c193abdc25bf6ebe" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Thu Jun 09 09:13:32 2011 -0700" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Jun 10 14:55:36 2011 +0200" }, "message": "treewide: Convert uses of struct resource to resource_size(ptr)\n\nSeveral fixes as well where the +1 was missing.\n\nDone via coccinelle scripts like:\n\n@@\nstruct resource *ptr;\n@@\n\n- ptr-\u003eend - ptr-\u003estart + 1\n+ resource_size(ptr)\n\nand some grep and typing.\n\nMostly uncompiled, no cross-compilers.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" } ], "next": "2809e80b8a73d556b2302e273966fb15db16c51e" }