)]}' { "log": [ { "commit": "7a9b149212f3716c598afe973b6261fd58453b7a", "tree": "477716d84c71da124448b72278e98da28aadbd3d", "parents": [ "3d62e3fdce8ef265a3706c52ae1ca6ab84e30f0e", "e26bcf37234c67624f62d9fc95f922b8dbda1363" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 21:26:12 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 21:26:12 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (229 commits)\n USB: remove unused usb_buffer_alloc and usb_buffer_free macros\n usb: musb: update gfp/slab.h includes\n USB: ftdi_sio: fix legacy SIO-device header\n USB: kl5usb105: reimplement using generic framework\n USB: kl5usb105: minor clean ups\n USB: kl5usb105: fix memory leak\n USB: io_ti: use kfifo to implement write buffering\n USB: io_ti: remove unsused private counter\n USB: ti_usb: use kfifo to implement write buffering\n USB: ir-usb: fix incorrect write-buffer length\n USB: aircable: fix incorrect write-buffer length\n USB: safe_serial: straighten out read processing\n USB: safe_serial: reimplement read using generic framework\n USB: safe_serial: reimplement write using generic framework\n usb-storage: always print quirks\n USB: usb-storage: trivial debug improvements\n USB: oti6858: use port write fifo\n USB: oti6858: use kfifo to implement write buffering\n USB: cypress_m8: use kfifo to implement write buffering\n USB: cypress_m8: remove unused drain define\n ...\n\nFix up conflicts (due to usb_buffer_alloc/free renaming) in\n\tdrivers/input/tablet/acecad.c\n\tdrivers/input/tablet/kbtab.c\n\tdrivers/input/tablet/wacom_sys.c\n\tdrivers/media/video/gspca/gspca.c\n\tsound/usb/usbaudio.c\n" }, { "commit": "f8965467f366fd18f01feafb5db10512d7b4422c", "tree": "3706a9cd779859271ca61b85c63a1bc3f82d626e", "parents": [ "a26272e5200765691e67d6780e52b32498fdb659", "2ec8c6bb5d8f3a62a79f463525054bae1e3d4487" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 21:04:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 21:04:44 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits)\n qlcnic: adding co maintainer\n ixgbe: add support for active DA cables\n ixgbe: dcb, do not tag tc_prio_control frames\n ixgbe: fix ixgbe_tx_is_paused logic\n ixgbe: always enable vlan strip/insert when DCB is enabled\n ixgbe: remove some redundant code in setting FCoE FIP filter\n ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp\n ixgbe: fix header len when unsplit packet overflows to data buffer\n ipv6: Never schedule DAD timer on dead address\n ipv6: Use POSTDAD state\n ipv6: Use state_lock to protect ifa state\n ipv6: Replace inet6_ifaddr-\u003edead with state\n cxgb4: notify upper drivers if the device is already up when they load\n cxgb4: keep interrupts available when the ports are brought down\n cxgb4: fix initial addition of MAC address\n cnic: Return SPQ credit to bnx2x after ring setup and shutdown.\n cnic: Convert cnic_local_flags to atomic ops.\n can: Fix SJA1000 command register writes on SMP systems\n bridge: fix build for CONFIG_SYSFS disabled\n ARCNET: Limit com20020 PCI ID matches for SOHARD cards\n ...\n\nFix up various conflicts with pcmcia tree drivers/net/\n{pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and\nwireless/orinoco/spectrum_cs.c} and feature removal\n(Documentation/feature-removal-schedule.txt).\n\nAlso fix a non-content conflict due to pm_qos_requirement getting\nrenamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c\n" }, { "commit": "95344fcc07964202737f85c16dbabbc40cae5e4d", "tree": "1cb338af3630c8057d255bb01bdd6e716fc4c526", "parents": [ "73a0bd77d60163d8b4639834119a1ed65155c062" ], "author": { "name": "Anand Gadiyar", "email": "gadiyar@ti.com", "time": "Mon May 10 21:56:10 2010 +0530" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu May 20 13:21:44 2010 -0700" }, "message": "USB: omap3: add platform init code for OHCI driver\n\nAdd platform init code for the OMAP3 OHCI driver.\n\nAlso, configure padconf settings for OMAP3 depending\non which port mode is used.\n\nSigned-off-by: Anand Gadiyar \u003cgadiyar@ti.com\u003e\nCc: David Brownell \u003cdbrownell@users.sourceforge.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "58815fa3bffdee8dbac5af6931eea991d7a71a19", "tree": "582ab7198c56b21a85a83ed21e53c433a691faa0", "parents": [ "d7086ddb4d3c2f8007ed5e0bb1f30a06c1bb3480" ], "author": { "name": "Ajay Kumar Gupta", "email": "ajay.gupta@ti.com", "time": "Thu Mar 25 13:25:27 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu May 20 13:21:36 2010 -0700" }, "message": "usb: musb: Add extvbus in musb_board_data\n\nEXTVBUS programming is required by OMAP3EVM REV \u003e\u003dE to supply 500mA\npower so adding a flag which can be used by musb driver to program\nEXTVBUS.\n\nSigned-off-by: Ajay Kumar Gupta \u003cajay.gupta@ti.com\u003e\nSigned-off-by: Felipe Balbi \u003cfelipe.balbi@nokia.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "04afb40593f9a3007e5ea817d009529ef10fb685", "tree": "de5a16c2b1e5f2d97a7c2eccea4677719817f282", "parents": [ "7f06a8b26aba1dc03b42272dc0089a800372c575", "cce4f632db200aef147c59084437168174b23f11" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 09:45:38 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 09:45:38 2010 -0700" }, "message": "Merge branch \u0027acpica\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6\n\n* \u0027acpica\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (22 commits)\n ACPI: fix early DSDT dmi check warnings on ia64\n ACPICA: Update version to 20100428.\n ACPICA: Update/clarify some parameter names associated with acpi_handle\n ACPICA: Rename acpi_ex_system_do_suspend-\u003eacpi_ex_system_do_sleep\n ACPICA: Prevent possible allocation overrun during object copy\n ACPICA: Split large file, evgpeblk\n ACPICA: Add GPE support for dynamically loaded ACPI tables\n ACPICA: Clarify/rename some root table descriptor fields\n ACPICA: Update version to 20100331.\n ACPICA: Minimize the differences between linux GPE code and ACPICA code base\n ACPI: add boot option acpi\u003dcopy_dsdt to fix corrupt DSDT\n ACPICA: Update DSDT copy/detection.\n ACPICA: Add subsystem option to force copy of DSDT to local memory\n ACPICA: Add detection of corrupted/replaced DSDT\n ACPICA: Add write support for DataTable operation regions\n ACPICA: Fix for acpi_reallocate_root_table for incorrect root table copy\n ACPICA: Update comments/headers, no functional change\n ACPICA: Update version to 20100304\n ACPICA: Fix for possible fault in acpi_ex_release_mutex\n ACPICA: Standardize integer output for ACPICA warnings/errors\n ...\n" }, { "commit": "7f06a8b26aba1dc03b42272dc0089a800372c575", "tree": "7c67198f83d069eb13fd417e022d111b7e4c82a1", "parents": [ "c3ad33c9bcb6616999953af76f16318120fe3691", "d71f4cece4bd97d05592836202fc04ff2e7817e3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 09:41:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 09:41:44 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (250 commits)\n ALSA: hda: Storage class should be before const qualifier\n ASoC: tpa6130a2: Remove CPVSS and HPVdd supplies\n ASoC: tpa6130a2: Define output pins with SND_SOC_DAPM_OUTPUT\n ASoC: sdp4430 - add sdp4430 pcm ops to DAI.\n ASoC: TWL6040: Enable earphone path in codec\n ASoC: SDP4430: Add support for Earphone speaker\n ASoC: SDP4430: Add sdp4430 machine driver\n ASoC: tlv320dac33: Avoid powering off while in BIAS_OFF\n ASoC: tlv320dac33: Use dev_dbg in dac33_hard_power function\n ALSA: sound/pci/asihpi: Use kzalloc\n ALSA: hdmi - dont fail on extra nodes\n ALSA: intelhdmi - add id for the CougarPoint chipset\n ALSA: intelhdmi - user friendly codec name\n ALSA: intelhdmi - add dependency on SND_DYNAMIC_MINORS\n ALSA: asihpi: incorrect range check\n ALSA: asihpi: testing the wrong variable\n ALSA: es1688: add pedantic range checks\n ARM: McBSP: Add support for omap4 in McBSP driver\n ARM: McBSP: Fix request for irq in OMAP4\n OMAP: McBSP: Add 32-bit mode support\n ...\n" }, { "commit": "c3ad33c9bcb6616999953af76f16318120fe3691", "tree": "a6b239cecc675693cfb5145493bd1b750ea360fb", "parents": [ "fb091be08d1acf184e8801dfdcace6e0cb19b1fe", "b5c80bc5d70a1ce5b071ed06dd95292b9de46f95" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 09:41:17 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 09:41:17 2010 -0700" }, "message": "Merge branch \u0027for-linus/i2c-2635\u0027 of git://git.fluff.org/bjdooks/linux\n\n* \u0027for-linus/i2c-2635\u0027 of git://git.fluff.org/bjdooks/linux: (21 commits)\n i2c-highlander: remover superflous variable\n i2c-ibm-iic: drop NO_IRQ\n i2c-cpm: drop NO_IRQ\n i2c-mpc: drop NO_IRQ\n MAINTAINERS: add i2c tree for embedded platforms\n i2c-pxa: only define \u0027blue_murder\u0027-function if DEBUG is #defined\n i2c-pxa: remove unused macro\n i2c-nomadik: fix operator precedence warning\n i2c-nomadik: release region when removed\n OMAP3: I2C: Clean up Errata 1p153 handling\n OMAP2/3: I2C: Errata ID i207: Clear wrong RDR interrupt\n omap: i2c: add a timeout to the busy waiting\n omap: i2c: make errata 1.153 workaround a separate function\n i2c-omap: add mpu wake up latency constraint in i2c\n omap: i2c: Add i2c support on omap4 platform\n i2c-bfin-twi: return completion in interrupt for smbus quick transfers\n i2c-bfin-twi: remove redundant retry\n i2c-bfin-twi: fix lost interrupts at high speeds\n i2c-bfin-twi: add debug output for error status\n i2c-bfin-twi: integrate timeout timer with completion interface\n ...\n" }, { "commit": "f39d01be4c59a61a08d0cb53f615e7016b85d339", "tree": "6777590e3ff2ddf4df1d38444ba7d692cd463b7b", "parents": [ "54291263519ac2c9bdda68b23b02fef3808deed4", "7db82437cfcac4bdfe79a6323eb554fdfa271623" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 09:20:59 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 09:20:59 2010 -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: (44 commits)\n vlynq: make whole Kconfig-menu dependant on architecture\n add descriptive comment for TIF_MEMDIE task flag declaration.\n EEPROM: max6875: Header file cleanup\n EEPROM: 93cx6: Header file cleanup\n EEPROM: Header file cleanup\n agp: use NULL instead of 0 when pointer is needed\n rtc-v3020: make bitfield unsigned\n PCI: make bitfield unsigned\n jbd2: use NULL instead of 0 when pointer is needed\n cciss: fix shadows sparse warning\n doc: inode uses a mutex instead of a semaphore.\n uml: i386: Avoid redefinition of NR_syscalls\n fix \"seperate\" typos in comments\n cocbalt_lcdfb: correct sections\n doc: Change urls for sparse\n Powerpc: wii: Fix typo in comment\n i2o: cleanup some exit paths\n Documentation/: it\u0027s -\u003e its where appropriate\n UML: Fix compiler warning due to missing task_struct declaration\n UML: add kernel.h include to signal.c\n ...\n" }, { "commit": "9c688c114c4665ac8c6da05b2f6b987f4adc6dae", "tree": "b6f20a4d6fa4bb5efa0cad5d1dc75ec2b1c2b163", "parents": [ "9d35bc1ec696ebfc5662a0d00b4d36564ff3af53", "308eb7add8adaca8088c28a3f7610069b70d1ad6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 09:02:49 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 09:02:49 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:\n ia64: add sparse annotation to __ia64_per_cpu_var()\n percpu: implement kernel memory based chunk allocation\n percpu: move vmalloc based chunk management into percpu-vm.c\n percpu: misc preparations for nommu support\n percpu: reorganize chunk creation and destruction\n percpu: factor out pcpu_addr_in_first/reserved_chunk() and update per_cpu_ptr_to_phys()\n" }, { "commit": "d71f4cece4bd97d05592836202fc04ff2e7817e3", "tree": "6c877c7a938758b1323d9c97d46b9c536e618c69", "parents": [ "19008bdacb9f7841166ebafe0aef361ee582ffbf", "ad8332c1302bcb4f80d593fd3eb477be9d7f5604" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu May 20 12:00:43 2010 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu May 20 12:00:43 2010 +0200" }, "message": "Merge branch \u0027topic/asoc\u0027 into for-linus\n\nConflicts:\n\tsound/soc/codecs/ad1938.c\n" }, { "commit": "6fa0fddd5f60064f22f8d389f5aeb7dd1646dfe1", "tree": "bf3cd405213c37f1ed363c3b2f542088e05ea571", "parents": [ "7d02093e29de9efc4a72d5e93baae9506969b789", "fec84e330719c20d2146c8dbdc9ff50b3a1d7039" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 17:10:24 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 17:10:24 2010 -0700" }, "message": "Merge branch \u0027timers-for-linus-hpet\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-for-linus-hpet\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, hpet: Add reference to chipset erratum documentation for disable-hpet-msi-quirk\n x86, hpet: Restrict read back to affected ATI chipsets\n" }, { "commit": "7d02093e29de9efc4a72d5e93baae9506969b789", "tree": "a6fc2450132ae419934f6eb9d223baa338b7d782", "parents": [ "6e0b7b2c39b91b467270dd0bc383914f99e1fb28", "e9ddbc075d95b2edf111247cdde16f33c31654a8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 17:10:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 17:10:06 2010 -0700" }, "message": "Merge branch \u0027timers-for-linus-cleanups\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-for-linus-cleanups\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n avr32: Fix typo in read_persistent_clock()\n sparc: Convert sparc to use read/update_persistent_clock\n cris: Convert cris to use read/update_persistent_clock\n m68k: Convert m68k to use read/update_persistent_clock\n m32r: Convert m32r to use read/update_peristent_clock\n blackfin: Convert blackfin to use read/update_persistent_clock\n ia64: Convert ia64 to use read/update_persistent_clock\n avr32: Convert avr32 to use read/update_persistent_clock\n h8300: Convert h8300 to use read/update_persistent_clock\n frv: Convert frv to use read/update_persistent_clock\n mn10300: Convert mn10300 to use read/update_persistent_clock\n alpha: Convert alpha to use read/update_persistent_clock\n xtensa: Fix unnecessary setting of xtime\n time: Clean up direct xtime usage in xen\n" }, { "commit": "20c9d2c4ab8243a1c311248232954b2c1da3ba75", "tree": "e035de70d7b89618bb0e6923272849df7d1acb9a", "parents": [ "f38e66e0077659e5d2ca3858fdb26fc9b1765b9f" ], "author": { "name": "Kalle Jokiniemi", "email": "kalle.jokiniemi@digia.com", "time": "Tue May 11 11:35:08 2010 -0700" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Thu May 20 00:18:59 2010 +0100" }, "message": "i2c-omap: add mpu wake up latency constraint in i2c\n\nWhile waiting for completion of the i2c transfer, the\nMPU could hit OFF mode and cause several msecs of\ndelay that made i2c transfers fail more often. The\nextra delays and subsequent re-trys cause i2c clocks\nto be active more often. This has also an negative\neffect on power consumption.\n\nCreated a mechanism for passing and using the\nconstraint setting function in driver code. The used\nmpu wake up latency constraints are now set individually\nper bus, and they are calculated based on clock rate\nand fifo size.\n\nThanks to Jarkko Nikula, Moiz Sonasath, Paul Walmsley,\nand Nishanth Menon for tuning out the details of\nthis patch.\n\nUpdates by Kevin as requested by Tony:\n\n- Remove omap_set_i2c_constraint_func() in favor of conditionally\n adding the flag in omap_i2c_add_bus() in order to keep all the OMAP\n conditional checking in a single location.\n- Update set_mpu_wkup_lat prototypes to match OMAP PM layer so\n OMAP PM function can be used directly in pdata.\n\nCc: Moiz Sonasath \u003cm-sonasath@ti.com\u003e\nCc: Jarkko Nikula \u003cjhnikula@gmail.com\u003e\nCc: Paul Walmsley \u003cpaul@pwsan.com\u003e\nCc: Nishanth Menon \u003cnm@ti.com\u003e\nSigned-off-by: Kalle Jokiniemi \u003ckalle.jokiniemi@digia.com\u003e\nSigned-off-by: Kevin Hilman \u003ckhilman@deeprootsystems.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "e4e47eb15b7884963efe7f98231009c5770a2c3d", "tree": "ebd3536a3aa728089168f072c88858578535046d", "parents": [ "711f77f53c5ff6aa61dbe8e5f518e50d6306e89d", "7b52161d14fa8a22a2387f4aa2fb7b854587830d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 13:35:07 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 13:35:07 2010 -0700" }, "message": "Merge branch \u0027msm-core\u0027 of git://codeaurora.org/quic/kernel/dwalker/linux-msm\n\n* \u0027msm-core\u0027 of git://codeaurora.org/quic/kernel/dwalker/linux-msm: (72 commits)\n msm: 7x30 Kconfig and makefile changes\n msm: clock support for the MSM7x30 CPU.\n msm: physical offset for MSM7X30\n msm: io: add io support for 7x30\n msm: Add extern for 7x30 clock list.\n msm: dma: add 7x30 security domain abstraction\n msm: update basic board layout for MSM7x30\n msm: add devices-msm7x30.c\n msm: add msm_iomap-7x30.h for MSM7x30 support\n msm: irqs: add irqs-7x30.h for MSM7x30 support\n msm: 8x50 Kconfig changes\n msm: physical offset for QSD8x50\n msm: io: add io support for 8x50\n msm: add extern for 8x50 clock list.\n msm: add devices-qsd8x50.c\n msm: update basic board layout for QSD8x50\n msm: add msm_iomap-8x50.h for QSD8x50 support\n msm: irqs: add irqs-8x50.h for QSD8x50 support\n msm: timer: allow MSM_DGT_BASE to be overriden\n msm: add Qualcomm 7x30 interrupt controller driver.\n ...\n" }, { "commit": "711f77f53c5ff6aa61dbe8e5f518e50d6306e89d", "tree": "93bc99051b26586916a628b1a276543085f80ff2", "parents": [ "024a6b95181f2df6090975c8a293499d24bf8b28", "273fca0ecad9305247043815e185d1bfd04047d4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 13:34:20 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 13:34:20 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:\n sparc: Define ARCH_SLAB_MINALIGN\n drivers/sbus/char/flash.c: flash_read should update ppos instead of file-\u003ef_pos\n sparc64: Fix stack dumping and tracing when function graph is enabled.\n sparc64: Show stack backtrace from show_regs() just like other platforms.\n" }, { "commit": "024a6b95181f2df6090975c8a293499d24bf8b28", "tree": "8da0a465bc35ab250897fb6bea1bcb64cdef9a05", "parents": [ "349e1fba7e63b1067b5915337986060c13d9edd0", "5e682ef825302f2378726e44257291eaeadbfd50" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 12:08:50 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 12:08:50 2010 -0700" }, "message": "Merge branch \u0027davinci-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci\n\n* \u0027davinci-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (48 commits)\n Revert \"rtc: omap: let device wakeup capability be configured from chip init logic\"\n DM365: Added more PINMUX configurations for AEMIF\n DM365: Make CLKOUTx available\n DM365: Added PINMUX definitions for GPIO30..32\n Davinci: iotable based ioremap() interception\n Davinci: pinmux - use ioremap()\n Davinci: aintc/cpintc - use ioremap()\n Davinci: psc - use ioremap()\n Davinci: timer - use ioremap()\n Davinci: jtag_id - use ioremap()\n Davinci: da8xx: rtc - use ioremap\n Davinci: gpio - use ioremap()\n davinci: edma: fix coding style issue related to breaking lines\n davinci: edma: use BIT() wherever possible\n davinci: edma: fix coding style issue related to usage of braces\n davinci: edma: use a more intuitive name for edma_info\n Davinci: serial - conditional reset via pwremu\n Davinci: serial - use ioremap()\n Davinci: serial - remove unnecessary define\n Davinci: watchdog reset separation across socs\n ...\n\nFix up trivial conflict in arch/arm/Kconfig due to removal of \"select\nGENERIC_TIME\"\n" }, { "commit": "349e1fba7e63b1067b5915337986060c13d9edd0", "tree": "7450f8355fb7f050066aab3fb94c1073e2080f7a", "parents": [ "fa9dc265ace9774e62f0e31108e5f47911124bda", "504d36e91ac12ccdb0e1193cee7bef9831a1c99e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 11:49:33 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 11:49:33 2010 -0700" }, "message": "Merge branch \u0027for-linus/samsung4\u0027 of git://git.fluff.org/bjdooks/linux\n\n* \u0027for-linus/samsung4\u0027 of git://git.fluff.org/bjdooks/linux: (98 commits)\n Input: s3c24xx_ts - depend on SAMSUNG_DEV_TS and update menu entry\n Input: s3c24xx_ts - Add FEAT for Samsung touchscreen support\n Input: s3c24xx_ts - Implement generic GPIO configuration callback\n ARM: SAMSUNG: Move s3c64xx dev-ts.c to plat-samsung and rename configuration\n ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreen\n ARM: S3C64XX: Add touchscreen platform device definition\n ARM: SAMSUNG: Move mach/ts.h to plat/ts.h\n ARM: S5PC100: Move i2c helpers from plat-s5pc1xx to mach-s5pc100\n ARM: S5PC100: Move frame buffer helpers from plat-s5pc1xx to mach-s5pc100\n ARM: S5PC100: gpio.h cleanup\n ARM: S5PC100: Move gpio support from plat-s5pc1xx to mach-s5pc100\n ARM: S5PC100: Use common functions for gpiolib implementation\n drivers: serial: S5PC100 serial driver cleanup\n ARM: S5PC100: Pre-requisite clock patch for plat-s5pc1xx to plat-s5p move\n ARM: SAMSUNG: Copy common I2C0 device helpers to machine directories\n ARM: SAMSUNG: move driver strength gpio configuration helper to common dir\n ARM: S5PV210: Add GPIOlib support\n ARM: SAMSUNGy: fix broken timer irq base\n ARM: SMDK6440: Add audio devices on board\n ARM: S5P6440: Add audio platform devices\n ...\n" }, { "commit": "cf77e988ddfc7f047ac1ddc72cadb5eee7e09293", "tree": "d4870b7290ea50fe01ed4d56febad449f1206172", "parents": [ "1d3c6ff44ad4b5f113602e153026a338f0f9b3ff", "2a2ae2426bba944ce6dbcad35e1580df57aafcf1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 11:41:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 11:41:52 2010 -0700" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:\n [IA64] Drop duplicated \"config IOMMU_HELPER\"\n [IA64] invoke oom-killer from page fault\n [IA64] use __ratelimit\n [IA64] Use set_cpus_allowed_ptr\n [IA64] Use set_cpus_allowed_ptr\n [IA64] arch/ia64/hp/common/sba_iommu.c: Rename dev_info to adi\n [IA64] removing redundant ifdef\n" }, { "commit": "1d3c6ff44ad4b5f113602e153026a338f0f9b3ff", "tree": "1e1f2932634fc6d0e4acfe68496c1c727b83a13e", "parents": [ "7c7cbaf5b82c418cd3b1dcf718f71d0e6057e639", "717e7c2672e37253a4d3aa70e4716b5b0a658761" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 11:37:22 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 11:37:22 2010 -0700" }, "message": "Merge branch \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (224 commits)\n ARM: remove \u0027select GENERIC_TIME\u0027\n ARM: 6136/1: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO\n ARM: 6074/1: oprofile: convert from sysdev to platform device\n ARM: 6073/1: oprofile: remove old files and update KConfig\n ARM: 6072/1: oprofile: use perf-events framework as backend\n ARM: 6071/1: perf-events: allow modules to query the number of hardware counters\n ARM: 6070/1: perf-events: add support for xscale PMUs\n ARM: 6069/1: perf-events: use numeric ID to identify PMU\n ARM: 6064/1: pmu: register IRQs at runtime\n ARM: Optionally allow ARMv6 to use \u0027normal, bufferable\u0027 memory for DMA\n ARM: 6134/1: Handle instruction cache maintenance fault properly\n ARM: nwfpe: allow debugging output to be configured at runtime\n ARM: rename mach_cpu_disable() to platform_cpu_disable()\n ARM: 6132/1: PL330: Add common core driver\n ARM: 6094/1: Extend cache-l2x0 to support the 16-way PL310\n ARM: Move memory mapping into mmu.c\n ARM: Ensure meminfo is sorted prior to sanity_check_meminfo\n ARM: Remove useless linux/bootmem.h includes\n ARM: convert /proc/cpu/aligment to seq_file\n arm: use asm-generic/scatterlist.h\n ...\n" }, { "commit": "7c7cbaf5b82c418cd3b1dcf718f71d0e6057e639", "tree": "da9aaa5a246af464b1e10d88618c1cad07b76314", "parents": [ "ba0234ec35127fe21d373db53cbaf9fe20620cb6", "4d0956b8f597aac10208ca763f8fe641fde16aab" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 11:36:03 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 11:36:03 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (127 commits)\n sh: update defconfigs.\n sh: Fix up the NUMA build for recent LMB changes.\n sh64: provide a stub per_cpu_trap_init() definition.\n sh: fix up CONFIG_KEXEC\u003dn build.\n sh: fixup the docbook paths for clock framework shuffling.\n driver core: Early dev_name() depends on slab_is_available().\n sh: simplify WARN usage in SH clock driver\n sh: Check return value of clk_get on ms7724\n sh: Check return value of clk_get on ecovec24\n sh: move sh clock-cpg.c contents to drivers/sh/clk-cpg.c\n sh: move sh clock.c contents to drivers/sh/clk.\n sh: move sh asm/clock.h contents to linux/sh_clk.h V2\n sh: remove unused clock lookup\n sh: switch boards to clkdev\n sh: switch sh4-202 to clkdev\n sh: switch shx3 to clkdev\n sh: switch sh7757 to clkdev\n sh: switch sh7763 to clkdev\n sh: switch sh7780 to clkdev\n sh: switch sh7786 to clkdev\n ...\n" }, { "commit": "ba0234ec35127fe21d373db53cbaf9fe20620cb6", "tree": "a2cbef204482512ae9e723f2bf4d22051975ef45", "parents": [ "537b60d17894b7c19a6060feae40299d7109d6e7", "939e379e9e183ae6291ac7caa4a5e1dfadae4ccc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 11:35:30 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 11:35:30 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git390.marist.edu/pub/scm/linux-2.6\n\n* \u0027for-linus\u0027 of git://git390.marist.edu/pub/scm/linux-2.6: (24 commits)\n [S390] drivers/s390/char: Use kmemdup\n [S390] drivers/s390/char: Use kstrdup\n [S390] debug: enable exception-trace debug facility\n [S390] s390_hypfs: Add new attributes\n [S390] qdio: remove API wrappers\n [S390] qdio: set correct bit in dsci\n [S390] qdio: dont convert timestamps to microseconds\n [S390] qdio: remove memset hack\n [S390] qdio: prevent starvation on PCI devices\n [S390] qdio: count number of qdio interrupts\n [S390] user space fault: report fault before calling do_exit\n [S390] topology: expose core identifier\n [S390] dasd: remove uid from devmap\n [S390] dasd: add dynamic pav toleration\n [S390] vdso: add missing vdso_install target\n [S390] vdso: remove redundant check for CONFIG_64BIT\n [S390] avoid default_llseek in s390 drivers\n [S390] vmcp: disallow modular build\n [S390] add breaking event address for user space\n [S390] virtualization aware cpu measurement\n ...\n" }, { "commit": "2b6c02abca5a04bf8d9f8a3b1976a5b10d317603", "tree": "25f22fe271f6bf713b41bfdbe4719e713aea7062", "parents": [ "5bfdca146edc558ae6b3bac6b05dc5b1f094fbf3" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 14:36:28 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:25:30 2010 +0900" }, "message": "ARM: SAMSUNG: Move s3c64xx dev-ts.c to plat-samsung and rename configuration\n\nMove the arch/arm/mach-s3c64xx/dev-ts.c file to arch/arm/plat-samsung and\nrename the Kconfig entry appropriately.\n\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "5bfdca146edc558ae6b3bac6b05dc5b1f094fbf3", "tree": "16f5d546a0ac4cd948efa8576ce20f8ecc6f865e", "parents": [ "909de0d67dbd9488d5f77bdcadcd34264fea3c02" ], "author": { "name": "Naveen Krishna", "email": "ch.naveen@samsung.com", "time": "Tue May 18 20:44:27 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:25:22 2010 +0900" }, "message": "ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreen\n\nThis patch implements cfg_gpio function for Samsung touchscreen.\nAnd also modifies the H1940 machine respectively.\n\nSigned-off-by: Naveen Krishna Ch \u003cch.naveen@samsung.com\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "909de0d67dbd9488d5f77bdcadcd34264fea3c02", "tree": "5a114e652b5b47d6c491e58b6cec68aff1dc7254", "parents": [ "73e59b1d6b69f5ae02e3be5e2b3259c46d8bb27a" ], "author": { "name": "Maurus Cuelenaere", "email": "mcuelenaere@gmail.com", "time": "Tue May 04 13:12:44 2010 +0200" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:25:14 2010 +0900" }, "message": "ARM: S3C64XX: Add touchscreen platform device definition\n\nThis patch adds the touchscreen platform device definition for S3C64XX boards.\n\nSigned-off-by: Maurus Cuelenaere \u003cmcuelenaere@gmail.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "73e59b1d6b69f5ae02e3be5e2b3259c46d8bb27a", "tree": "87bb82e794e3704eb7039cbea7df8da7097ce906", "parents": [ "51ffd971edb2d5187007967c14712a8ed956c092" ], "author": { "name": "Maurus Cuelenaere", "email": "mcuelenaere@gmail.com", "time": "Tue May 04 13:12:41 2010 +0200" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:25:07 2010 +0900" }, "message": "ARM: SAMSUNG: Move mach/ts.h to plat/ts.h\n\nThis moves mach-s3c2410/include/mach/ts.h to plat-samsung/include/plat/ts.h in\norder to prepare for s3c64xx support in the touchscreen driver.\n\nSigned-off-by: Maurus Cuelenaere \u003cmcuelenaere@gmail.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "51ffd971edb2d5187007967c14712a8ed956c092", "tree": "051b8ec9aacc970bd291c4cb7ac5da54f77b4c7a", "parents": [ "b884c0e07058478bff82b8edcecff4e2919fa361" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue May 18 12:38:44 2010 +0200" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:23:37 2010 +0900" }, "message": "ARM: S5PC100: Move i2c helpers from plat-s5pc1xx to mach-s5pc100\n\nMove i2c helpers from plat-s5pc1xx to mach-s5pc100.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "b884c0e07058478bff82b8edcecff4e2919fa361", "tree": "a46f312e4f6de9a326e5853e32e147e8c53d86f4", "parents": [ "c8bb9635f926aaf15987450c57af05e422874b92" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue May 18 12:38:43 2010 +0200" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:23:27 2010 +0900" }, "message": "ARM: S5PC100: Move frame buffer helpers from plat-s5pc1xx to mach-s5pc100\n\nMove frame buffer helpers from plat-s5pc1xx to mach-s5pc100.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "c8bb9635f926aaf15987450c57af05e422874b92", "tree": "4039f9f9b07606f53c7a2e853c6cd658f85d40b4", "parents": [ "7904449021de399a03ec8a32e536d031a61def5b" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue May 18 12:38:42 2010 +0200" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:23:19 2010 +0900" }, "message": "ARM: S5PC100: gpio.h cleanup\n\nThis patch renames gpio related registers from s5pc1xx to s5pc100 to\nbetter match the plat-s5p framework style. GPIO_MP* defines now used\nanywhere thus has been removed.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "7904449021de399a03ec8a32e536d031a61def5b", "tree": "610c804c4bd185147e5507f28de5b458121ea015", "parents": [ "252b8efeba9cd1e28ade902275b27133114d2382" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue May 18 12:38:41 2010 +0200" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:23:11 2010 +0900" }, "message": "ARM: S5PC100: Move gpio support from plat-s5pc1xx to mach-s5pc100\n\nMove gpio-lib support from plat-s5pc1xx to mach-s5pc100. Only basic gpio\nfunctionality is now supported. Gpio interrupts are disabled temporarly\nand will be added later.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "252b8efeba9cd1e28ade902275b27133114d2382", "tree": "f1dc9ac4ceceaada3333731fc171d1542e72c237", "parents": [ "cb34a67472c3171f350e45bc66eebf480acec792" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue May 18 12:38:40 2010 +0200" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:23:03 2010 +0900" }, "message": "ARM: S5PC100: Use common functions for gpiolib implementation\n\nGPIOlib helpers from plat-samsung already have functions for accessing\n4bit gpio banks. This patch removes the duplicated functions from\nplat-s5pc1xx/gpiolib.c.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "a443a6373d8527657cfde3d3c515d4a64532c585", "tree": "d4c64220ba399d4dc98f9e8921385787968e3dc0", "parents": [ "a0f735812e9ffb65fa4c8a16975f5b63909fb447" ], "author": { "name": "Thomas Abraham", "email": "thomas.ab@samsung.com", "time": "Fri May 14 16:27:28 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:22:47 2010 +0900" }, "message": "ARM: S5PC100: Pre-requisite clock patch for plat-s5pc1xx to plat-s5p move\n\nThis is a pre-requisite clock patch for the plat-s5pc1xx to plat-s5p\nmovement. The patches that perform the movement of the code from\nplat-s5pc1xx to plat-s5p (and mach-s5pc100) should also enable the\nbuild for the mach-s5pc100/clock.c code.\n\nSigned-off-by: Thomas Abraham \u003cthomas.ab@samsung.com\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "a0f735812e9ffb65fa4c8a16975f5b63909fb447", "tree": "e768dd697961173868507a41dc7165c127c8cda5", "parents": [ "838c6d499b780c42fccbbdfecc0f5dcc471d0ef3" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue May 18 12:23:35 2010 +0200" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:16:04 2010 +0900" }, "message": "ARM: SAMSUNG: Copy common I2C0 device helpers to machine directories\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "838c6d499b780c42fccbbdfecc0f5dcc471d0ef3", "tree": "8dbbe6ad6f940c390ea62c273470480ebdde2d63", "parents": [ "14b8a0f92b309ff452a8c339abd9a096d00b210f" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue May 18 12:23:36 2010 +0200" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:15:02 2010 +0900" }, "message": "ARM: SAMSUNG: move driver strength gpio configuration helper to common dir\n\nDriver strength parameter can be changed not only on S5PC100 but also\non S5PV210/S5PC110 platforms, so move the helper functions to the common\nplat-samsung directory.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "14b8a0f92b309ff452a8c339abd9a096d00b210f", "tree": "0472637882c576873aae00207a07f9d178cdebd7", "parents": [ "05a690d2db5bd57d3c94293b06b69158535835df", "adc0950c08e1f433f6933759f4facf9b2cf8d29d" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:07:25 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:07:25 2010 +0900" }, "message": "ARM: Merge for-2635/samsung-rtc\n\nMerge branch \u0027for-2635/samsung-rtc\u0027 into for-linus/samsung2\n\nConflicts:\n\tarch/arm/mach-s3c64xx/include/mach/map.h\n\tarch/arm/plat-samsung/Kconfig\n\tarch/arm/plat-samsung/Makefile\n" }, { "commit": "05a690d2db5bd57d3c94293b06b69158535835df", "tree": "fb924faf327ae3d6b1f4a7cde96e007e9b32d7be", "parents": [ "1770a8988f6178efdc1bfc85fb29deacac49fe91", "4f7cdc38c000deba82479205f4c99f4c1e7c6d1f" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:05:42 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:05:42 2010 +0900" }, "message": "ARM: Merge for-2635/samsung-ts\n\nMerge branch \u0027for-2635/samsung-ts\u0027 into for-linus/samsung2\n" }, { "commit": "1770a8988f6178efdc1bfc85fb29deacac49fe91", "tree": "b20b8da8b92e388847a55e7c7da9d919fe3f3abb", "parents": [ "1e8ff636beb6ee5c87868a6081cc4f95b1ccd713", "734552072335b00476b626b027ca4a9f57147b6f" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:05:33 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:05:33 2010 +0900" }, "message": "ARM: Merge for-2635/s5p-audio\n\nMerge branch \u0027for-2635/s5p-audio\u0027 into for-linus/samsung2\n" }, { "commit": "1e8ff636beb6ee5c87868a6081cc4f95b1ccd713", "tree": "5a6be34a53bf640c035d642b4d19388d6a7fd6cc", "parents": [ "32457942b90aabb9242b450f02d18d9c8d982916", "7d1a2077a7e519fc0c68617526abea3f72632e60" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:05:15 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:05:15 2010 +0900" }, "message": "ARM: Merge for-2635/s5p-dma\n\nMerge branch \u0027for-2635/s5p-dma\u0027 into for-linus/samsung2\n\nConflicts:\n\tarch/arm/mach-s5pv210/Makefile\n" }, { "commit": "32457942b90aabb9242b450f02d18d9c8d982916", "tree": "6472b77016f83f2ada7a7e2ca83a9803f313f1a8", "parents": [ "6071399674e813d797d9f458ec8913b86c85398e", "f64bea4318a73e833d0a9b8400cc0f6cee957da3" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:11 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:11 2010 +0900" }, "message": "ARM: Merge for-2635/fb-updates1\n\nMerge branch \u0027for-2635/fb-updates1\u0027 into for-linus/samsung2\n" }, { "commit": "6071399674e813d797d9f458ec8913b86c85398e", "tree": "d4d178b3ef312a41536d0db8288e9b1555a4c5b4", "parents": [ "d16067b25e17d38ee11f5760f90edcecc4c77c09", "f64cacc3194f49c7371e2ce61c22de62b8652dc7" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:10 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:10 2010 +0900" }, "message": "ARM: Merge for-2635/s5pv210-clock\n\nMerge branch \u0027for-2635/s5pv210-clock\u0027 into for-linus/samsung2\n" }, { "commit": "d16067b25e17d38ee11f5760f90edcecc4c77c09", "tree": "ffad58f6cfe42bf833cf281f53c3d2cf780bdc2c", "parents": [ "2abbfb26de6cc8c362033f7d03278824113a4b0d", "b3b84d652da3aba06ec26c0570ca138d8c7f1b65" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:09 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:09 2010 +0900" }, "message": "ARM: Merge for-2635/s5p6440-clock\n\nMerge branch \u0027for-2635/s5p6440-clock\u0027 into for-linus/samsung2\n" }, { "commit": "2abbfb26de6cc8c362033f7d03278824113a4b0d", "tree": "e709172d6ae38d12bdebf77faa87c3861d22275a", "parents": [ "ff1b8ba01dc80da338890a187c112fdd3c0b9202", "05e021f095ffe9c7c1a695a3e2835f39243c6270" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:09 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:09 2010 +0900" }, "message": "ARM: Merge for-2635/s3c6410-clock\n\nMerge branch \u0027for-2635/s3c6410-clock\u0027 into for-linus/samsung2\n" }, { "commit": "ff1b8ba01dc80da338890a187c112fdd3c0b9202", "tree": "415999aa2c3ac52e48c2b6f690bba393e3d7a00c", "parents": [ "5fcdb16bd04fdeb313ee33bb269b04e59a9abf91", "32b6cb3872883861f3a2669cce880f3a7ef8979a" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:08 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:08 2010 +0900" }, "message": "ARM: Merge for-2635/gpio2\n\nMerge branch \u0027for-2635/gpio2\u0027 into for-linus/samsung2\n" }, { "commit": "5fcdb16bd04fdeb313ee33bb269b04e59a9abf91", "tree": "aa167b3cc6f3ae8765e19284966f938f7dcf1f85", "parents": [ "5a5c419fe902458bfef936e32dc6472de04c56cf", "192ff91fc84e067a3babfddb96114a51c939548e" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:07 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:07 2010 +0900" }, "message": "ARM: Merge for-2635/rx1950\n\nMerge branch \u0027for-2635/rx1950\u0027 into for-linus/samsung2\n" }, { "commit": "5a5c419fe902458bfef936e32dc6472de04c56cf", "tree": "2dac84e35702da9fde36e03e652980e29c198082", "parents": [ "71b4439657a135a9ca7d11bc4ae3105628ed1186", "0c3767b161a91eab5b23d602d374b9c070c067a9" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:06 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:06 2010 +0900" }, "message": "ARM: Merge for-2635/acer-n35\n\nMerge branch \u0027for-2635/acer-n35\u0027 into for-linus/samsung2\n" }, { "commit": "71b4439657a135a9ca7d11bc4ae3105628ed1186", "tree": "1f0838ed6988bcc1d32a9a0439576b44e229ffaf", "parents": [ "f447ea4b1c90fe94f0627d7a6655a402100f8ca5", "f001d5b28bc583c85281a9ce315ac16970201eae" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:06 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:06 2010 +0900" }, "message": "ARM: Merge for-2635/samsung-clock\n\nMerge branch \u0027for-2635/samsung-clock\u0027 into for-linus/samsung2\n" }, { "commit": "f447ea4b1c90fe94f0627d7a6655a402100f8ca5", "tree": "980d128c2c68c8c5cd949ae082b11a4540194b95", "parents": [ "c733a7179cacdf77be9c1eeef02d6e0833919d89", "6cd82ffe0cd3836b32b29bd1436e5fd551957d54" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:05 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:05 2010 +0900" }, "message": "ARM: Merge for-2635/samsung-hwmon\n\nMerge branch \u0027for-2635/samsung-hwmon\u0027 into for-linus/samsung2\n" }, { "commit": "c733a7179cacdf77be9c1eeef02d6e0833919d89", "tree": "8d6404926c4673014fd63946d1028605cdd02e45", "parents": [ "359542b2a1d8a945c135c2c4ea4434ce69fc2723", "14894b9b8317d9a337bba55998fdef1c9b2dc63d" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:04 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:04 2010 +0900" }, "message": "ARM: Merge for-2635/samsung-dma\n\nMerge branch \u0027for-2635/samsung-dma\u0027 into for-linus/samsung2\n" }, { "commit": "359542b2a1d8a945c135c2c4ea4434ce69fc2723", "tree": "4dc5b1dfc14d9ae73043728749007750e53a92eb", "parents": [ "bc3b67b8e965c1b499d604b7ec7d2e6090570c13", "ea5f50706385b61c1c0d24271bbe7c6e93129fbc" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:03 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:03 2010 +0900" }, "message": "ARM: Merge for-2635/s5p-general\n\nMerge branch \u0027for-2635/s5p-general\u0027 into for-linus/samsung2\n" }, { "commit": "bc3b67b8e965c1b499d604b7ec7d2e6090570c13", "tree": "ea89cc298093c96162c76deccf424a4dc16d0842", "parents": [ "b78232da3f85950a207bbcb64db46fd95b581465", "26be1b7b317f1d6e9226ba3f450476b0a6d423a3" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:03 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:03 2010 +0900" }, "message": "ARM: Merge for-2635/s3c24xx-general\n\nMerge branch \u0027for-2635/s3c24xx-general\u0027 into for-linus/samsung2\n" }, { "commit": "ea5f50706385b61c1c0d24271bbe7c6e93129fbc", "tree": "adfec8fe237681382d9a267bee0fc609f70e5567", "parents": [ "1131379b48228afb32fa626fb27586a02246acf9" ], "author": { "name": "Pannaga Bhushan", "email": "p.bhushan@samsung.com", "time": "Wed May 19 17:25:32 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:03:47 2010 +0900" }, "message": "ARM: S5PV210: Add GPIOlib support\n\nThis patch adds GPIOlib support for S5PV210.\n\nSigned-off-by: Pannaga Bhushan \u003cp.bhushan@samsung.com\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "1131379b48228afb32fa626fb27586a02246acf9", "tree": "56ce48cddcf6e28e181b22487d0a104b5bb5ad85", "parents": [ "0ad73cefa2ec509126af466718e0c3cb1ad8ae9b" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Fri May 14 08:18:52 2010 +0200" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:01:25 2010 +0900" }, "message": "ARM: SAMSUNGy: fix broken timer irq base\n\nTimer interrupts range was defined as 43-47, what overlaps with VIC0 range\n(32-64). This was caused probably by a typo while the common interrupts\ndefinition was refactored. This patch moves timer interrupt range to safe\narea of 11-15 (just before uart range).\n\nThis fixes the commit 87aef30eb3c5dac0491c83fe3b90bc61f1df24ec\n(\"ARM: S5P: Change S5P_TIMER_IRQ based to 11 for SAMSUNG S5P series.\")\nwhich meant to move these into the old (and previously reserved)\nISA space.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\n[ben-linux@fluff.org: update description]\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "2ec8c6bb5d8f3a62a79f463525054bae1e3d4487", "tree": "fa7f8400ac685fb52e96f64997c7c682fc2aa021", "parents": [ "7b39f90fabcf9e2af0cd79d0a60440d821e22b56", "537b60d17894b7c19a6060feae40299d7109d6e7" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 18 23:01:55 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 18 23:01:55 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of /home/davem/src/GIT/linux-2.6/\n\nConflicts:\n\tinclude/linux/mod_devicetable.h\n\tscripts/mod/file2alias.c\n" }, { "commit": "273fca0ecad9305247043815e185d1bfd04047d4", "tree": "ea472046a1d4137adcb1f6594f2d7db9b268ccf9", "parents": [ "be94bbb5db4de0f3a2a5405511ea3ebea261f2c8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 18 15:23:58 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 18 15:23:58 2010 -0700" }, "message": "sparc: Define ARCH_SLAB_MINALIGN\n\nBecause SLOB fancies being different, the default minimum alignment is\nonly \"unsigned long\" instead of SLAB/SLUB where the default is\n\"unsigned long long\"\n\nThe inconsistency makes no sense and is asking for trouble, but define\nARCH_SLAB_MINALIGN to get it right in all cases even after they fix\nthe inconsistency.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2a2ae2426bba944ce6dbcad35e1580df57aafcf1", "tree": "289df04c7b545630633f8a8d9b91e137b2dc0039", "parents": [ "0c3b96e44739cdba7a75030107a2b47a15ee5f60" ], "author": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Wed May 12 09:30:27 2010 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Tue May 18 14:45:54 2010 -0700" }, "message": "[IA64] Drop duplicated \"config IOMMU_HELPER\"\n\nOne entry for this in arch/ia64/Kconfig should be enough.\n\nReported-by: Christoph Egger \u003csiccegge@cs.fau.de\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "0c3b96e44739cdba7a75030107a2b47a15ee5f60", "tree": "a67169bfcd43d4cb6eb2e8839e8eec0b3a9c0768", "parents": [ "7683a3f9748f7adfbe47e33002a4f710ab557293" ], "author": { "name": "npiggin@suse.de", "email": "npiggin@suse.de", "time": "Fri May 07 14:34:33 2010 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Tue May 18 14:45:54 2010 -0700" }, "message": "[IA64] invoke oom-killer from page fault\n\nAs explained in commit 1c0fe6e3bd, we want to call the architecture independent\noom killer when getting an unexplained OOM from handle_mm_fault, rather than\nsimply killing current.\n\nAcked-by: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "7683a3f9748f7adfbe47e33002a4f710ab557293", "tree": "468c3ef3126f84a1a35891a5213f4c517113160e", "parents": [ "552dce3a071f0de2a84023fbba7f3b4ac36602cd" ], "author": { "name": "Akinobu Mita", "email": "akinobu.mita@gmail.com", "time": "Sun Feb 28 19:58:14 2010 +0900" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Tue May 18 14:45:54 2010 -0700" }, "message": "[IA64] use __ratelimit\n\nReplace open-coded rate limiting logic with __ratelimit().\n\nSigned-off-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "552dce3a071f0de2a84023fbba7f3b4ac36602cd", "tree": "490c63647dcaa2b5f8519908dd003c59d17eb30c", "parents": [ "93f7c93bee6382e01c34ea0c34ff8fb98c648734" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Fri Mar 26 23:02:23 2010 +0100" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Tue May 18 14:45:53 2010 -0700" }, "message": "[IA64] Use set_cpus_allowed_ptr\n\nUse set_cpus_allowed_ptr rather than set_cpus_allowed.\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "93f7c93bee6382e01c34ea0c34ff8fb98c648734", "tree": "defc28087c82368589d121d132965587e8fdd98e", "parents": [ "80aa9bf0d8083554967400d48dbec078aa8f128e" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Fri Mar 26 23:02:47 2010 +0100" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Tue May 18 14:45:53 2010 -0700" }, "message": "[IA64] Use set_cpus_allowed_ptr\n\nUse set_cpus_allowed_ptr rather than set_cpus_allowed.\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "80aa9bf0d8083554967400d48dbec078aa8f128e", "tree": "dd95bdf8804165ca1a798e44b5fd7c841a56139e", "parents": [ "82b22c887e02fc6ebeebc8ec43fb1d348e2a6a58" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon Apr 05 12:05:31 2010 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Tue May 18 14:45:53 2010 -0700" }, "message": "[IA64] arch/ia64/hp/common/sba_iommu.c: Rename dev_info to adi\n\nThere is a macro called dev_info that prints struct device specific\ninformation. Having variables with the same name can be confusing and\nprevents conversion of the macro to a function.\n\nRename the existing dev_info variables to something else in preparation\nto converting the dev_info macro to a function.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "82b22c887e02fc6ebeebc8ec43fb1d348e2a6a58", "tree": "bed512b8b59ab887aa522227f87545265865b09f", "parents": [ "e40152ee1e1c7a63f4777791863215e3faa37a86" ], "author": { "name": "Jiri Olsa", "email": "jolsa@redhat.com", "time": "Thu May 06 19:36:06 2010 +0200" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Tue May 18 14:45:52 2010 -0700" }, "message": "[IA64] removing redundant ifdef\n\nPointless to use #ifdef CONFIG_NUMA in code that is\nalready inside another #ifdef CONFIG_NUMA.\n\nSigned-off-by: Jiri Olsa \u003cjolsa@redhat.com\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "537b60d17894b7c19a6060feae40299d7109d6e7", "tree": "11a30267b4ecb7175d02215a995c8b6461304b9c", "parents": [ "3ae684e1c48e6deedc9b9faff8fa1c391ca8a652", "a289cc7c70da784a2d370b91885cab4f966dcb0f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 09:46:35 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 09:46:35 2010 -0700" }, "message": "Merge branch \u0027x86-uv-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-uv-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, UV: uv_irq.c: Fix all sparse warnings\n x86, UV: Improve BAU performance and error recovery\n x86, UV: Delete unneeded boot messages\n x86, UV: Clean up UV headers for MMR definitions\n" }, { "commit": "3ae684e1c48e6deedc9b9faff8fa1c391ca8a652", "tree": "07082b3239c24799e8aaf2e6a8a0ac059870d34a", "parents": [ "c4fd308ed62f292518363ea9c6c2adb3c2d95f9d", "4bd96a7a8185755b091233b16034c7436cbf57af" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 09:28:24 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 09:28:24 2010 -0700" }, "message": "Merge branch \u0027x86-txt-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-txt-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, tboot: Add support for S3 memory integrity protection\n" }, { "commit": "c4fd308ed62f292518363ea9c6c2adb3c2d95f9d", "tree": "d6b4e36159e502a43a91ade86379703442204fc5", "parents": [ "96fbeb973a7e17594a429537201611ca0b395622", "1f9cc3cb6a27521edfe0a21abf97d2bb11c4d237" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 09:28:04 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 09:28:04 2010 -0700" }, "message": "Merge branch \u0027x86-pat-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-pat-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, pat: Update the page flags for memtype atomically instead of using memtype_lock\n x86, pat: In rbt_memtype_check_insert(), update new-\u003etype only if valid\n x86, pat: Migrate to rbtree only backend for pat memtype management\n x86, pat: Preparatory changes in pat.c for bigger rbtree change\n rbtree: Add support for augmented rbtrees\n" }, { "commit": "96fbeb973a7e17594a429537201611ca0b395622", "tree": "0f90e3724f804776d6ae00009c2e30bd4ab015aa", "parents": [ "1f8caa986a5f4de2e40f3defe66a07b4c5a019c2", "fea24e28c663e62663097f0ed3b8ff1f9a87f15e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 09:27:49 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 09:27:49 2010 -0700" }, "message": "Merge branch \u0027x86-mrst-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-mrst-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, mrst: add nop functions to x86_init mpparse functions\n x86, mrst, pci: return 0 for non-present pci bars\n x86: Avoid check hlt for newer cpus\n" }, { "commit": "1f8caa986a5f4de2e40f3defe66a07b4c5a019c2", "tree": "3bd71405d98a9a0851c8b60c589a14d58743b8a0", "parents": [ "d6f3875252bb703a9a3de0b92f7ae154f12c986c", "2e61878698781d6a9a8bfbaa4ea9c5ddb5a178c3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 09:17:50 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 09:17:50 2010 -0700" }, "message": "Merge branch \u0027x86-mm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-mm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86-64: Combine SRAT regions when possible\n" }, { "commit": "d6f3875252bb703a9a3de0b92f7ae154f12c986c", "tree": "d89d745f08f467d0e197056fa956ddc701574d38", "parents": [ "cb41838bbc4403f7270a94b93a9a0d9fc9c2e7ea", "3f10940e4fb69d312602078f2c5234206797ca31" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 09:17:17 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 09:17:17 2010 -0700" }, "message": "Merge branch \u0027x86-microcode-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-microcode-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86/microcode: Use nonseekable_open()\n x86: Improve Intel microcode loader performance\n" }, { "commit": "cb41838bbc4403f7270a94b93a9a0d9fc9c2e7ea", "tree": "0f359975ccad4ac72e86b8edf1924c076e74bd89", "parents": [ "98f01720cbe3e2eb719682777049b6514e9db556", "c59bd5688299cddb71183e156e7a3c1409b90df2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 09:17:01 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 09:17:01 2010 -0700" }, "message": "Merge branch \u0027core-hweight-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-hweight-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, hweight: Use a 32-bit popcnt for __arch_hweight32()\n arch, hweight: Fix compilation errors\n x86: Add optimized popcnt variants\n bitops: Optimize hweight() by making use of compile-time evaluation\n" }, { "commit": "98f01720cbe3e2eb719682777049b6514e9db556", "tree": "af2fc4642dd0bfd195b0f60f1f267e8b02aa0009", "parents": [ "41d59102e146a4423a490b8eca68a5860af4fe1c", "4f47b4c9f0b711bf84adb8c27774ae80d346b628" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 09:15:57 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 09:15:57 2010 -0700" }, "message": "Merge branch \u0027x86-irq-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-irq-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, acpi/irq: Define gsi_end when X86_IO_APIC is undefined\n x86, irq: Kill io_apic_renumber_irq\n x86, acpi/irq: Handle isa irqs that are not identity mapped to gsi\u0027s.\n x86, ioapic: Simplify probe_nr_irqs_gsi.\n x86, ioapic: Optimize pin_2_irq\n x86, ioapic: Move nr_ioapic_registers calculation to mp_register_ioapic.\n x86, ioapic: In mpparse use mp_register_ioapic\n x86, ioapic: Teach mp_register_ioapic to compute a global gsi_end\n x86, ioapic: Fix the types of gsi values\n x86, ioapic: Fix io_apic_redir_entries to return the number of entries.\n x86, ioapic: Only export mp_find_ioapic and mp_find_ioapic_pin in io_apic.h\n x86, acpi/irq: Generalize mp_config_acpi_legacy_irqs\n x86, acpi/irq: Fix acpi_sci_ioapic_setup so it has both bus_irq and gsi\n x86, acpi/irq: pci device dev-\u003eirq is an isa irq not a gsi\n x86, acpi/irq: Teach acpi_get_override_irq to take a gsi not an isa_irq\n x86, acpi/irq: Introduce apci_isa_irq_to_gsi\n" }, { "commit": "41d59102e146a4423a490b8eca68a5860af4fe1c", "tree": "739ed4113ccdaeb33d1723a6beab09c1e18d7048", "parents": [ "3e1dd193edefd2a806a0ba6cf0879cf1a95217da", "c9775b4cc522e5f1b40b1366a993f0f05f600f39" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 08:58:16 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 08:58:16 2010 -0700" }, "message": "Merge branch \u0027x86-fpu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-fpu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, fpu: Use static_cpu_has() to implement use_xsave()\n x86: Add new static_cpu_has() function using alternatives\n x86, fpu: Use the proper asm constraint in use_xsave()\n x86, fpu: Unbreak FPU emulation\n x86: Introduce \u0027struct fpu\u0027 and related API\n x86: Eliminate TS_XSAVE\n x86-32: Don\u0027t set ignore_fpu_irq in simd exception\n x86: Merge kernel_math_error() into math_error()\n x86: Merge simd_math_error() into math_error()\n x86-32: Rework cache flush denied handler\n\nFix trivial conflict in arch/x86/kernel/process.c\n" }, { "commit": "07d77759c95d899b84f8e473a01cff001019dd5f", "tree": "d039fa6b38475868ebf2bd63ec14f49031d3f0b2", "parents": [ "b7723f9d21d8d6043e63f5e3e412f321f5f1900c", "3998d095354d2a3062bdaa821ef07a1e1c82873c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 08:49:13 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 08:49:13 2010 -0700" }, "message": "Merge branch \u0027x86-cpu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-cpu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, hypervisor: add missing \u003clinux/module.h\u003e\n Modify the VMware balloon driver for the new x86_hyper API\n x86, hypervisor: Export the x86_hyper* symbols\n x86: Clean up the hypervisor layer\n x86, HyperV: fix up the license to mshyperv.c\n x86: Detect running on a Microsoft HyperV system\n x86, cpu: Make APERF/MPERF a normal table-driven flag\n x86, k8: Fix build error when K8_NB is disabled\n x86, cacheinfo: Disable index in all four subcaches\n x86, cacheinfo: Make L3 cache info per node\n x86, cacheinfo: Reorganize AMD L3 cache structure\n x86, cacheinfo: Turn off L3 cache index disable feature in virtualized environments\n x86, cacheinfo: Unify AMD L3 cache index disable checking\n cpufreq: Unify sysfs attribute definition macros\n powernow-k8: Fix frequency reporting\n x86, cpufreq: Add APERF/MPERF support for AMD processors\n x86: Unify APERF/MPERF support\n powernow-k8: Add core performance boost support\n x86, cpu: Add AMD core boosting feature flag to /proc/cpuinfo\n\nFix up trivial conflicts in arch/x86/kernel/cpu/intel_cacheinfo.c and\ndrivers/cpufreq/cpufreq_ondemand.c\n" }, { "commit": "b7723f9d21d8d6043e63f5e3e412f321f5f1900c", "tree": "984098e5c060600e90e62f1b101593805f7cb2e9", "parents": [ "93c9d7f60c0cb7715890b1f9e159da6f4d1f5a65", "6fc108a08dcddf8f9113cc7102ddaacf7ed37a6b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 08:40:21 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 08:40:21 2010 -0700" }, "message": "Merge branch \u0027x86-cleanups-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-cleanups-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Clean up arch/x86/Kconfig*\n x86-64: Don\u0027t export init_level4_pgt\n" }, { "commit": "93c9d7f60c0cb7715890b1f9e159da6f4d1f5a65", "tree": "6be428ca5fe52f14ebb78a8e695cec59d2f21c26", "parents": [ "7421a10de7a525f67cc082fca7a91011d00eada4", "d9c5841e22231e4e49fd0a1004164e6fce59b7a6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 08:40:05 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 08:40:05 2010 -0700" }, "message": "Merge branch \u0027x86-atomic-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-atomic-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Fix LOCK_PREFIX_HERE for uniprocessor build\n x86, atomic64: In selftest, distinguish x86-64 from 586+\n x86-32: Fix atomic64_inc_not_zero return value convention\n lib: Fix atomic64_inc_not_zero test\n lib: Fix atomic64_add_unless return value convention\n x86-32: Fix atomic64_add_unless return value convention\n lib: Fix atomic64_add_unless test\n x86: Implement atomic[64]_dec_if_positive()\n lib: Only test atomic64_dec_if_positive on archs having it\n x86-32: Rewrite 32-bit atomic64 functions in assembly\n lib: Add self-test for atomic64_t\n x86-32: Allow UP/SMP lock replacement in cmpxchg64\n x86: Add support for lock prefix in alternatives\n" }, { "commit": "7421a10de7a525f67cc082fca7a91011d00eada4", "tree": "6b4509858003c6cf140e223e1dcc4250def2c75c", "parents": [ "752f114fb83c5839de37a250b4f8257ed5438341", "9e565292270a2d55524be38835104c564ac8f795" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 08:35:37 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 08:35:37 2010 -0700" }, "message": "Merge branch \u0027x86-asm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-asm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Use .cfi_sections for assembly code\n x86-64: Reduce SMP locks table size\n x86, asm: Introduce and use percpu_inc()\n" }, { "commit": "b8ae30ee26d379db436b0b8c8c3ff1b52f69e5d1", "tree": "506aa0b4bdbf90f61e7e9261c7db90aa1452dcce", "parents": [ "4d7b4ac22fbec1a03206c6cde353f2fd6942f828", "9c6f7e43b4e02c161b53e97ba913855246876c61" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 08:27:54 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 08:27:54 2010 -0700" }, "message": "Merge branch \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (49 commits)\n stop_machine: Move local variable closer to the usage site in cpu_stop_cpu_callback()\n sched, wait: Use wrapper functions\n sched: Remove a stale comment\n ondemand: Make the iowait-is-busy time a sysfs tunable\n ondemand: Solve a big performance issue by counting IOWAIT time as busy\n sched: Intoduce get_cpu_iowait_time_us()\n sched: Eliminate the ts-\u003eidle_lastupdate field\n sched: Fold updating of the last_update_time_info into update_ts_time_stats()\n sched: Update the idle statistics in get_cpu_idle_time_us()\n sched: Introduce a function to update the idle statistics\n sched: Add a comment to get_cpu_idle_time_us()\n cpu_stop: add dummy implementation for UP\n sched: Remove rq argument to the tracepoints\n rcu: need barrier() in UP synchronize_sched_expedited()\n sched: correctly place paranioa memory barriers in synchronize_sched_expedited()\n sched: kill paranoia check in synchronize_sched_expedited()\n sched: replace migration_thread with cpu_stop\n stop_machine: reimplement using cpu_stop\n cpu_stop: implement stop_cpu[s]()\n sched: Fix select_idle_sibling() logic in select_task_rq_fair()\n ...\n" }, { "commit": "4d7b4ac22fbec1a03206c6cde353f2fd6942f828", "tree": "2d96a9e9c28cf6fa628a278decc00ad55a8b043b", "parents": [ "3aaf51ace5975050ab43c7d4d7e439e0ae7d13d7", "94f3ca95787ada3d64339a4ecb2754236ab563f6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 08:19:03 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 08:19:03 2010 -0700" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (311 commits)\n perf tools: Add mode to build without newt support\n perf symbols: symbol inconsistency message should be done only at verbose\u003d1\n perf tui: Add explicit -lslang option\n perf options: Type check all the remaining OPT_ variants\n perf options: Type check OPT_BOOLEAN and fix the offenders\n perf options: Check v type in OPT_U?INTEGER\n perf options: Introduce OPT_UINTEGER\n perf tui: Add workaround for slang \u003c 2.1.4\n perf record: Fix bug mismatch with -c option definition\n perf options: Introduce OPT_U64\n perf tui: Add help window to show key associations\n perf tui: Make \u003c- exit menus too\n perf newt: Add single key shortcuts for zoom into DSO and threads\n perf newt: Exit browser unconditionally when CTRL+C, q or Q is pressed\n perf newt: Fix the \u0027A\u0027/\u0027a\u0027 shortcut for annotate\n perf newt: Make \u003c- exit the ui_browser\n x86, perf: P4 PMU - fix counters management logic\n perf newt: Make \u003c- zoom out filters\n perf report: Report number of events, not samples\n perf hist: Clarify events_stats fields usage\n ...\n\nFix up trivial conflicts in kernel/fork.c and tools/perf/builtin-record.c\n" }, { "commit": "3aaf51ace5975050ab43c7d4d7e439e0ae7d13d7", "tree": "3ceb741d8b78c6dc78be3fd2e4f8aac443044787", "parents": [ "f262af3d08d3fffc4e11277d3a177b2d67ea2aba", "cc49b092d308f8ea8634134b0d95d831a88a674b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 08:18:07 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 08:18:07 2010 -0700" }, "message": "Merge branch \u0027oprofile-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027oprofile-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (24 commits)\n oprofile/x86: make AMD IBS hotplug capable\n oprofile/x86: notify cpus only when daemon is running\n oprofile/x86: reordering some functions\n oprofile/x86: stop disabled counters in nmi handler\n oprofile/x86: protect cpu hotplug sections\n oprofile/x86: remove CONFIG_SMP macros\n oprofile/x86: fix uninitialized counter usage during cpu hotplug\n oprofile/x86: remove duplicate IBS capability check\n oprofile/x86: move IBS code\n oprofile/x86: return -EBUSY if counters are already reserved\n oprofile/x86: moving shutdown functions\n oprofile/x86: reserve counter msrs pairwise\n oprofile/x86: rework error handler in nmi_setup()\n oprofile: update file list in MAINTAINERS file\n oprofile: protect from not being in an IRQ context\n oprofile: remove double ring buffering\n ring-buffer: Add lost event count to end of sub buffer\n tracing: Show the lost events in the trace_pipe output\n ring-buffer: Add place holder recording of dropped events\n tracing: Fix compile error in module tracepoints when MODULE_UNLOAD not set\n ...\n" }, { "commit": "1014cfe2fb4cdd663137aafb21448cb613dd6a7d", "tree": "13b5fc4e7036b4226d94bd33aefb74a3dbb25b6a", "parents": [ "8123d8f17d8ba9d67e556688e4f025456ca97842", "4726f2a617ebd868a4fdeb5679613b897e5f1676" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 08:17:35 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 08:17:35 2010 -0700" }, "message": "Merge branch \u0027core-locking-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-locking-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n lockdep: Reduce stack_trace usage\n lockdep: No need to disable preemption in debug atomic ops\n lockdep: Actually _dec_ in debug_atomic_dec\n lockdep: Provide off case for redundant_hardirqs_on increment\n lockdep: Simplify debug atomic ops\n lockdep: Fix redundant_hardirqs_on incremented with irqs enabled\n lockstat: Make lockstat counting per cpu\n i8253: Convert i8253_lock to raw_spinlock\n" }, { "commit": "8123d8f17d8ba9d67e556688e4f025456ca97842", "tree": "1d15088a32644e464ad3536ad7bec775050065eb", "parents": [ "06ee772043c7ad125f2c2e6a08dc563706f39e8d", "795e74f7a69f9c08afa4fa7c86cc4f18a62bd630" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 07:22:37 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 07:22:37 2010 -0700" }, "message": "Merge branch \u0027core-iommu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-iommu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86/amd-iommu: Add amd_iommu\u003doff command line option\n iommu-api: Remove iommu_{un}map_range functions\n x86/amd-iommu: Implement -\u003e{un}map callbacks for iommu-api\n x86/amd-iommu: Make amd_iommu_iova_to_phys aware of multiple page sizes\n x86/amd-iommu: Make iommu_unmap_page and fetch_pte aware of page sizes\n x86/amd-iommu: Make iommu_map_page and alloc_pte aware of page sizes\n kvm: Change kvm_iommu_map_pages to map large pages\n VT-d: Change {un}map_range functions to implement {un}map interface\n iommu-api: Add -\u003e{un}map callbacks to iommu_ops\n iommu-api: Add iommu_map and iommu_unmap functions\n iommu-api: Rename -\u003e{un}map function pointers to -\u003e{un}map_range\n" }, { "commit": "734552072335b00476b626b027ca4a9f57147b6f", "tree": "5768b4d0c9a6ebac73caab4a09bd99421ae4a20c", "parents": [ "08885d0a4c4fa929c386e17c9682bf0d524146b9" ], "author": { "name": "Jassi Brar", "email": "jassi.brar@samsung.com", "time": "Tue May 18 16:03:07 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue May 18 19:09:51 2010 +0900" }, "message": "ARM: SMDK6440: Add audio devices on board\n\nAdd audio platform devices on the smdk by default.\n\nSigned-off-by: Jassi Brar \u003cjassi.brar@samsung.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "08885d0a4c4fa929c386e17c9682bf0d524146b9", "tree": "66dd11e9f097fe1104de329a57594e0ba1f71fb6", "parents": [ "78a368234f51e54a8878ab00375be91a22e945b3" ], "author": { "name": "Jassi Brar", "email": "jassi.brar@samsung.com", "time": "Tue May 18 16:03:02 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue May 18 19:09:50 2010 +0900" }, "message": "ARM: S5P6440: Add audio platform devices\n\nDefine platform devices for all audio devices found on S5P6440\n\nSigned-off-by: Jassi Brar \u003cjassi.brar@samsung.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "78a368234f51e54a8878ab00375be91a22e945b3", "tree": "102a7b7692ed68299caa13dcc934e2b93409ad83", "parents": [ "070c808546f69bc37db14db96e043a3b8894e0e2" ], "author": { "name": "Jassi Brar", "email": "jassi.brar@samsung.com", "time": "Tue May 18 16:02:58 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue May 18 19:09:50 2010 +0900" }, "message": "ARM: SMDK6442: Add audio devices on board\n\nAdd audio platform devices on the smdk by default.\n\nSigned-off-by: Jassi Brar \u003cjassi.brar@samsung.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "070c808546f69bc37db14db96e043a3b8894e0e2", "tree": "b42e2e5ed97caaad0e9da4d89c2b44f93366439f", "parents": [ "95fa6e6cd34d33915504d207a832920d98e4e932" ], "author": { "name": "Jassi Brar", "email": "jassi.brar@samsung.com", "time": "Tue May 18 16:02:50 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue May 18 19:09:50 2010 +0900" }, "message": "ARM: S5P6442: Add audio platform devices\n\nDefine platform devices for all audio devices found on S5P6442\n\nSigned-off-by: Jassi Brar \u003cjassi.brar@samsung.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "95fa6e6cd34d33915504d207a832920d98e4e932", "tree": "9a5c9bf657ff7700c4db5e18d99d39364f70452d", "parents": [ "9b5f1e08c95a9df7de9a96a7a4240362358acd5f" ], "author": { "name": "Jassi Brar", "email": "jassi.brar@samsung.com", "time": "Tue May 18 16:02:35 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue May 18 19:09:49 2010 +0900" }, "message": "ARM: SMDKC110: Add audio devices on board\n\nAdd audio platform devices on the smdk by default.\n\nSigned-off-by: Jassi Brar \u003cjassi.brar@samsung.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "9b5f1e08c95a9df7de9a96a7a4240362358acd5f", "tree": "67446bcf5164e6bf2e3adec6e4c143762206ebb3", "parents": [ "602bf0cfbdedfd988e43203d2a26bdbbab639309" ], "author": { "name": "Jassi Brar", "email": "jassi.brar@samsung.com", "time": "Tue May 18 16:02:30 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue May 18 19:09:49 2010 +0900" }, "message": "ARM: SMDKV210: Add audio devices on board\n\nAdd audio platform devices on the smdk by default.\n\nSigned-off-by: Jassi Brar \u003cjassi.brar@samsung.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "602bf0cfbdedfd988e43203d2a26bdbbab639309", "tree": "7132aa1a9a73f38715b57cd7a726f85cc99dbbef", "parents": [ "7ebd467551ed6ae200d7835a84bbda0dcadaa511" ], "author": { "name": "Jassi Brar", "email": "jassi.brar@samsung.com", "time": "Tue May 18 16:02:26 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue May 18 19:09:49 2010 +0900" }, "message": "ARM: S5PV210: Add audio platform devices\n\nDefine platform devices for all audio devices found on S5PV210\n\nSigned-off-by: Jassi Brar \u003cjassi.brar@samsung.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "32b6cb3872883861f3a2669cce880f3a7ef8979a", "tree": "1d22180eb5121546f716b8b70004905c8d2a3aa9", "parents": [ "4ac2a39767c2a93c06b654a0bf1c635e03ff75ac" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue May 18 19:07:05 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue May 18 19:07:05 2010 +0900" }, "message": "ARM: SAMSUNG: Fix additional increment when running through gpios\n\nThe pm-gpio.c code was incrementing the gpio_nr from the nr_gpios\nfield and the bank-bank offset inside the loop, and also in the\nfor() loop with a ++.\n\nRemove the ++, as the number is already at the next GPIO, thus\nensuring that we don\u0027t skip a gpio bank by accident.\n\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "4ac2a39767c2a93c06b654a0bf1c635e03ff75ac", "tree": "1b7d4fc3fe061d730128b022961f027764e2f4f1", "parents": [ "1635ca4aaf835794401da33079e50ce1d6bbb5d0" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Mon May 17 15:12:33 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue May 18 19:06:35 2010 +0900" }, "message": "ARM: S3C24XX: Add note on GPIO bank sizes\n\nAdd a table for the GPIO bank sizes for each SoC\n\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "1635ca4aaf835794401da33079e50ce1d6bbb5d0", "tree": "e8b6284f10729f9d827d77ad853c83ea1796f118", "parents": [ "7987bd7a7051c979f7b9b572898f92dbef6aaeb1" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Mon May 17 14:53:48 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue May 18 19:06:34 2010 +0900" }, "message": "ARM: S3C24XX: Remove macros mapping GPIO number to base\n\nAs part of the cleanup, remove the old macros mapping GPIO numbers\nto the base of the register now we have gpiolib to manage the GPIO\nmappings for us.\n\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "7987bd7a7051c979f7b9b572898f92dbef6aaeb1", "tree": "71f6aceb2ee3b0a1b00e64f9763b6ee01cb81c55", "parents": [ "2c8fcfbf735e2d3b139e4247eb3e73edf64bb23f" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Mon May 17 14:28:44 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue May 18 19:06:33 2010 +0900" }, "message": "ARM: S3C24XX: Update missed gpio calls to use gpiolib\n\nUpdate a couple of S3C24XX and S3C2412 files that are still\nusing the GPIO number to register mapping calls to get the\ns3c_gpio_chip and use the base field from that.\n\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "2c8fcfbf735e2d3b139e4247eb3e73edf64bb23f", "tree": "253eb5464e32a159cac657deb341347d652354c3", "parents": [ "a0026418d3d99b68dbd6c91f277d6f764fe41956" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Mon May 17 14:13:16 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue May 18 19:06:32 2010 +0900" }, "message": "ARM: S3C24XX: Start cleanup of GPIO numbering\n\nStart cleaning up the numbering of GPIO banks by removing the old\nbank start definitions currently being used by some of the header\nfiles.\n\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "a0026418d3d99b68dbd6c91f277d6f764fe41956", "tree": "1c50b1fb2e4838f57b8a611508a453873a9d3186", "parents": [ "fcef85c0c122f90f57f2f3ef0caeaf6404d6e8f3" ], "author": { "name": "Vasily Khoruzhick", "email": "anarsoul@gmail.com", "time": "Wed May 12 10:22:41 2010 +0300" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue May 18 19:06:15 2010 +0900" }, "message": "ARM: S3C244X: fix gpiolib port J support\n\nIncrease GPIOs number for S3C244X, and make S3C_GPIO_END\npoint to BANKJ end, otherwise gpiolib refuses to register\nBANKJ\n\nSigned-off-by: Vasily Khoruzhick \u003canarsoul@gmail.com\u003e\n[ben-linux@fluff.org: Move pm fix to new patch]\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "f64bea4318a73e833d0a9b8400cc0f6cee957da3", "tree": "7ea2a44b745039041029acb5ecb2b83dae0a7cf4", "parents": [ "f077f3fc055b329787783a1ab0efb9a8f8ecc874" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Mon May 03 15:29:44 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue May 18 18:46:30 2010 +0900" }, "message": "ARM: SMDK2416: Add support for framebuffer device and ensure correct setup\n\nAdd support for the LCD display on the SMDJK2416, and correctly name the\nframebuffer device.\n\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "f077f3fc055b329787783a1ab0efb9a8f8ecc874", "tree": "8bce88e7cf179b2be87f8e9cf7a4af83fa295f4c", "parents": [ "dc5d2e8236e2eec461e8c34d302635142e93ab49" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Thu May 13 14:44:50 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue May 18 18:46:27 2010 +0900" }, "message": "ARM: SAMSUNG: Set S3C_FB_MAX_WIN in \u003cplat/fb.h\u003e\n\nMove the S3C_FB_MAX_WIN to the platform data to avoid\nhaving to include the registers with the platform data.\n\nSet S3C_FB_MAX_WIN to 5, which is the maximum that any\nof the current hardware can do and the cost of having\nit set to this for all is minimal (at least for the\nplatform data case), then always leave this as the maximum\nfor the systems supported.\n\nAlso remove the inclusion of \u003cmach/regs-fb.h\u003e from\nthe device definition in arch/arm/plat-samsung\n\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "dc5d2e8236e2eec461e8c34d302635142e93ab49", "tree": "eb1e449d31033ae57a0769f359c733670a0962e7", "parents": [ "fbd6fe73514cf31a07c7b16518930ea84c644463" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Fri Apr 30 19:34:25 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue May 18 18:46:25 2010 +0900" }, "message": "ARM: S3C2443: Fix definition of LCD clock bit\n\nFix the definition of the LCD clock bit, it is the TFT display\ncontroller on bit 9, not the older STN on bit 10.\n\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "fbd6fe73514cf31a07c7b16518930ea84c644463", "tree": "3459608f56913b6b84693b1d4079fe835eeeced7", "parents": [ "63b1f51b2405573d47bf5b9ab6e7cd5c697d3dcc" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Fri Apr 30 19:08:38 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue May 18 18:45:38 2010 +0900" }, "message": "ARM: S3C2443: Add initial defines for framebuffer support\n\nAdd the necessary defines to get the s3c-fb device to compile for\ns3c2443.\n\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "05e021f095ffe9c7c1a695a3e2835f39243c6270", "tree": "f05e2fda420142ffad6e6d7cdac67597cdeea780", "parents": [ "835879a8848e9de93d38cdae99bda18d08545586" ], "author": { "name": "Maurus Cuelenaere", "email": "mcuelenaere@gmail.com", "time": "Mon May 17 20:17:42 2010 +0200" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue May 18 18:21:59 2010 +0900" }, "message": "ARM: S3C64XX: Add USB external clock definition\n\nThis adds the xusbxti clock to S3C64XX platform.\n\nSigned-off-by: Maurus Cuelenaere \u003cmcuelenaere@gmail.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "4d0956b8f597aac10208ca763f8fe641fde16aab", "tree": "08ab399291de00cac6ced17d7b364ae5cacd62f2", "parents": [ "06225c08ec2ad0f0dec063df7f08773a8358db12" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue May 18 18:18:28 2010 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue May 18 18:18:28 2010 +0900" }, "message": "sh: update defconfigs.\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "06225c08ec2ad0f0dec063df7f08773a8358db12", "tree": "6656a5ff60a03dc05b1772b03af6a8fc267751a2", "parents": [ "dd2fdd264eaa616fab4cf80e89f83f4a2fc26288" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue May 18 18:15:44 2010 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue May 18 18:15:44 2010 +0900" }, "message": "sh: Fix up the NUMA build for recent LMB changes.\n\nNow that the node 0 initialization code has been overhauled, kill off the\nnow obsolete setup_memory() bits.\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "7d1a2077a7e519fc0c68617526abea3f72632e60", "tree": "6b3582875af4c4093bed4cfd0e0a16193f5e97d9", "parents": [ "d460f5b035c3b1d192d7ba1dbca50cb441fef08e" ], "author": { "name": "Jassi Brar", "email": "jassi.brar@samsung.com", "time": "Tue May 18 11:59:34 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue May 18 18:00:13 2010 +0900" }, "message": "S5PV210: DMA: Add platform devices for PL330 DMACs\n\nSamsung\u0027s Soc S5PV210 has three PL330 DMACs. First is dedicated for\nMemory-\u003eMemory data transfer while the other two meant for data\ntransfer with peripherals.\nDefine and add latter two PL330 DMACs as platform devices on the\nS5PV210 platform.\n\nSigned-off-by: Jassi Brar \u003cjassi.brar@samsung.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "d460f5b035c3b1d192d7ba1dbca50cb441fef08e", "tree": "0e01189caffd808ae775ca8bd96fdd15b1d72024", "parents": [ "d8b5065b75e87e87c2cbba984b3050e869b4b910" ], "author": { "name": "Jassi Brar", "email": "jassi.brar@samsung.com", "time": "Tue May 18 11:59:27 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue May 18 18:00:12 2010 +0900" }, "message": "S5P6442: DMA: Add platform devices for PL330 DMACs\n\nSamsung\u0027s Soc S5P6442 has two PL330 DMACs. First is dedicated for\nMemory-\u003eMemory data transfer while the second is meant for data\ntransfer with peripherals.\nDefine and add the peripheral PL330 DMAC as platform device on the\nS5P6442 platform.\n\nSigned-off-by: Jassi Brar \u003cjassi.brar@samsung.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" } ], "next": "d8b5065b75e87e87c2cbba984b3050e869b4b910" }