Changes in hotplug-script

e5451c8f8330e03ad3cfa16048b4daf961af434f - Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochip

Tue, 23 Feb 2016 14:07:08 +0000

Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochipBase for demv_gpiochip_add_data() and devm_gpiochip_remove(). List of files: /linux/Documentation/firmware_class/hotplug-script

2d8ad8719591fa803b0d589ed057fa46f49b7155 - Merge commit 'v2.6.38-rc1' into kbuild/packaging

Wed, 09 Mar 2011 15:15:44 +0000

Merge commit 'v2.6.38-rc1' into kbuild/packaging List of files: /linux/Documentation/firmware_class/hotplug-script

e8cdfb0509f48d44d95d68d4f42d8d71a9ba4acd - Merge branches 'sh/wdt', 'sh/pci-express-async' and 'common/serial-rework' into sh-latest

Wed, 26 Jan 2011 09:24:18 +0000

Merge branches 'sh/wdt', 'sh/pci-express-async' and 'common/serial-rework' into sh-latest List of files: /linux/Documentation/firmware_class/hotplug-script

f43dc23d5ea91fca257be02138a255f02d98e806 - Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework

Thu, 13 Jan 2011 06:06:28 +0000

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-reworkConflicts: arch/sh/kernel/cpu/sh2/setup-sh7619.c arch/sh/kernel/cpu/sh2a/setup-mxg.c arch/sh/kernel/cpu/sh2a/setup-sh7201.c arch/sh/kernel/cpu/sh2a/setup-sh7203.c arch/sh/kernel/cpu/sh2a/setup-sh7206.c arch/sh/kernel/cpu/sh3/setup-sh7705.c arch/sh/kernel/cpu/sh3/setup-sh770x.c arch/sh/kernel/cpu/sh3/setup-sh7710.c arch/sh/kernel/cpu/sh3/setup-sh7720.c arch/sh/kernel/cpu/sh4/setup-sh4-202.c arch/sh/kernel/cpu/sh4/setup-sh7750.c arch/sh/kernel/cpu/sh4/setup-sh7760.c arch/sh/kernel/cpu/sh4a/setup-sh7343.c arch/sh/kernel/cpu/sh4a/setup-sh7366.c arch/sh/kernel/cpu/sh4a/setup-sh7722.c arch/sh/kernel/cpu/sh4a/setup-sh7723.c arch/sh/kernel/cpu/sh4a/setup-sh7724.c arch/sh/kernel/cpu/sh4a/setup-sh7763.c arch/sh/kernel/cpu/sh4a/setup-sh7770.c arch/sh/kernel/cpu/sh4a/setup-sh7780.c arch/sh/kernel/cpu/sh4a/setup-sh7785.c arch/sh/kernel/cpu/sh4a/setup-sh7786.c arch/sh/kernel/cpu/sh4a/setup-shx3.c arch/sh/kernel/cpu/sh5/setup-sh5.c drivers/serial/sh-sci.c drivers/serial/sh-sci.h include/linux/serial_sci.h List of files: /linux/Documentation/firmware_class/hotplug-script

8990c1bc4be46473ad19bf2fa612ca57286f3df4 - Merge commit 'v2.6.37-rc1' into kbuild/kbuild

Tue, 14 Dec 2010 21:01:55 +0000

Merge commit 'v2.6.37-rc1' into kbuild/kbuild List of files: /linux/Documentation/firmware_class/hotplug-script

b74b953b998bcc2db91b694446f3a2619ec32de6 - Merge commit 'v2.6.36' into kbuild/misc

Wed, 27 Oct 2010 22:15:57 +0000

Merge commit 'v2.6.36' into kbuild/miscUpdate to be able to fix a recent change to scripts/basic/docproc.c(commit eda603f). List of files: /linux/Documentation/firmware_class/hotplug-script

239060b93bb30a4ad55f1ecaa512464a035cc5ba - Merge branch 'kbuild/rc-fixes' into kbuild/kconfig

Tue, 12 Oct 2010 13:09:06 +0000

Merge branch 'kbuild/rc-fixes' into kbuild/kconfigWe need to revert the temporary hack in 71ebc01, hence the merge. List of files: /linux/Documentation/firmware_class/hotplug-script

e199e6136ce6b151e6638ae93dca60748424d900 - Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Thu, 09 Sep 2010 06:49:04 +0000

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 List of files: /linux/Documentation/firmware_class/hotplug-script

daab7fc734a53fdeaf844b7c03053118ad1769da - Merge commit 'v2.6.36-rc3' into x86/memblock

Tue, 31 Aug 2010 07:45:21 +0000

Merge commit 'v2.6.36-rc3' into x86/memblockConflicts: arch/x86/kernel/trampoline.c mm/memblock.cMerge reason: Resolve the conflicts, update to latest upstream.Signed-off-by: Ingo Molnar List of files: /linux/Documentation/firmware_class/hotplug-script

f632265d0ffb5acf331252d98c64939849d96bb2 - Merge commit 'v2.6.36-rc1' into HEAD

Thu, 26 Aug 2010 17:22:27 +0000

Merge commit 'v2.6.36-rc1' into HEAD List of files: /linux/Documentation/firmware_class/hotplug-script

e981b060767b3c4ac9393ad8d2558d648e35dfcb - Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes

Fri, 20 Aug 2010 11:53:08 +0000

Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes List of files: /linux/Documentation/firmware_class/hotplug-script

c8710ad38900153af7a3e6762e99c062cfa46443 - Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core

Thu, 19 Aug 2010 10:48:09 +0000

Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core List of files: /linux/Documentation/firmware_class/hotplug-script

6ab561c8aab2e4af535f09adbc6253f958536848 - Merge branch 'topic/isa' into topic/misc

Wed, 18 Aug 2010 13:17:30 +0000

Merge branch 'topic/isa' into topic/misc List of files: /linux/Documentation/firmware_class/hotplug-script

e4862f2f6f5653dfb67f3ba2b6f0bc74516ed51a - Merge branch 'for-2.6.36' into for-2.6.37

Mon, 16 Aug 2010 17:42:58 +0000

Merge branch 'for-2.6.36' into for-2.6.37Fairly simple conflicts, the most serious ones are the i.MX ones which Isuspect now need another rename.Conflicts: arch/arm/mach-mx2/clock_imx27.c arch/arm/mach-mx2/devices.c arch/arm/mach-omap2/board-rx51-peripherals.c arch/arm/mach-omap2/board-zoom2.c sound/soc/fsl/mpc5200_dma.c sound/soc/fsl/mpc5200_dma.h sound/soc/fsl/mpc8610_hpcd.c sound/soc/pxa/spitz.c List of files: /linux/Documentation/firmware_class/hotplug-script

bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301 - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Mon, 16 Aug 2010 04:32:24 +0000

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6Conflicts: arch/sh/include/asm/Kbuild drivers/MakefileSigned-off-by: Paul Mundt List of files: /linux/Documentation/firmware_class/hotplug-script

95ee46aa8698f2000647dfb362400fadbb5807cf - Merge branch 'linus' into release

Sun, 15 Aug 2010 05:06:31 +0000

Merge branch 'linus' into releaseConflicts: drivers/acpi/debug.cSigned-off-by: Len Brown List of files: /linux/Documentation/firmware_class/hotplug-script

f46a6804135795f77d096ab0128f27531c7d051c - Merge branch 'linus' into perf/urgent

Thu, 12 Aug 2010 19:38:56 +0000

Merge branch 'linus' into perf/urgentMerge reason: Fix upstream breakage introduced by: de5d9bf: Move list types from to .Signed-off-by: Ingo Molnar List of files: /linux/Documentation/firmware_class/hotplug-script

fb8231a8b139035476f2a8aaac837d0099b66dad - Merge branch 'master' into for-next

Tue, 10 Aug 2010 11:22:08 +0000

Merge branch 'master' into for-nextConflicts: arch/arm/mach-omap1/board-nokia770.c List of files: /linux/Documentation/firmware_class/hotplug-script

fd8aa2c1811bf60ccb2d5de0579c6f62aec1772d - Merge git://git.infradead.org/users/dwmw2/libraid-2.6 into for-linus

Tue, 10 Aug 2010 00:02:33 +0000

Merge git://git.infradead.org/users/dwmw2/libraid-2.6 into for-linus List of files: /linux/Documentation/firmware_class/hotplug-script

d9a145fb6e5f37b9903dea8371ab5c3e34e8e2d1 - Merge commit 'linus/master' into bkl/core

Sun, 08 Aug 2010 23:49:58 +0000

Merge commit 'linus/master' into bkl/coreMerge reason: The staging tree has introduced the easycapdriver lately. We need the latest updates to pushdown thebkl in its ioctl helper. List of files: /linux/Documentation/firmware_class/hotplug-script