#
e0273728 |
| 05-Jan-2012 |
Jiri Kosina <jkosina@suse.cz> |
Merge branches 'hyperv', 'multitouch', 'roccat', 'upstream', 'upstream-fixes', 'wacom' and 'wiimote' into for-linus
|
#
4045407f |
| 05-Jan-2012 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'restart-cleanup' into restart
Conflicts: arch/arm/kernel/setup.c
|
#
4c5f830c |
| 05-Jan-2012 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEAD
Conflicts: arch/arm/plat-omap/include/plat/common.h
|
Revision tags: v3.2 |
|
#
3bd9e50b |
| 29-Dec-2011 |
Geert Uytterhoeven <geert@linux-m68k.org> |
m68k/mac: Make CONFIG_HEARTBEAT unavailable on Mac
mac_heartbeat() was never really implemented.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Greg Ungerer <gerg@uclinux.org>
|
#
251f39fe |
| 04-Jan-2012 |
Anton Vorontsov <cbouatmailru@gmail.com> |
Merge branch 'power-supply-scope' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
|
Revision tags: v3.2-rc7, v3.2-rc6, v3.2-rc5 |
|
#
176f2934 |
| 06-Dec-2011 |
Geert Uytterhoeven <geert@linux-m68k.org> |
m68k/serial: Remove references to obsolete serial config options
- ATARI_MFPSER, ATARI_MIDI, MULTIFACE_III_TTY, and DN_SERIAL have no corresponding drivers (anymore), - Clean up SERIAL_CONSO
m68k/serial: Remove references to obsolete serial config options
- ATARI_MFPSER, ATARI_MIDI, MULTIFACE_III_TTY, and DN_SERIAL have no corresponding drivers (anymore), - Clean up SERIAL_CONSOLE dependencies and help text.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
show more ...
|
#
1fbe6f62 |
| 20-Dec-2011 |
Dave Airlie <airlied@redhat.com> |
Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next
Merge in the upstream tree to bring in the mainline fixes.
Conflicts: drivers/gpu/drm/exynos/exynos_drm_fbdev.c dri
Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next
Merge in the upstream tree to bring in the mainline fixes.
Conflicts: drivers/gpu/drm/exynos/exynos_drm_fbdev.c drivers/gpu/drm/nouveau/nouveau_sgdma.c
show more ...
|
#
7e95e365 |
| 16-Dec-2011 |
Kalle Valo <kvalo@qca.qualcomm.com> |
Merge remote branch 'wireless-next/master' into ath6kl-next
Conflicts: drivers/net/wireless/ath/ath6kl/init.c
|
#
aaf01589 |
| 16-Dec-2011 |
Steve French <sfrench@us.ibm.com> |
Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6
|
#
704867ed |
| 14-Dec-2011 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'mfd/da9052' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc into regmap-next
|
#
68556ca1 |
| 12-Dec-2011 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'mfd/wm8994' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc into for-3.3
|
Revision tags: v3.2-rc4, v3.2-rc3, v3.2-rc2 |
|
#
1d9532b3 |
| 08-Nov-2011 |
Geert Uytterhoeven <geert@linux-m68k.org> |
m68k/serial: Remove references to obsolete CONFIG_SERIAL167
commit 51c9d654c2def97827395a7fbfd0c6f865c26544 ("Staging: delete tty drivers") removed the MVME167 serial driver, but forgot to remove th
m68k/serial: Remove references to obsolete CONFIG_SERIAL167
commit 51c9d654c2def97827395a7fbfd0c6f865c26544 ("Staging: delete tty drivers") removed the MVME167 serial driver, but forgot to remove these references.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
show more ...
|
#
d6c1c49d |
| 06-Dec-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'perf/urgent' into perf/core
Merge reason: Add these cherry-picked commits so that future changes on perf/core don't conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
e4da3fbf |
| 01-Dec-2011 |
Luciano Coelho <coelho@ti.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wl12xx-next
|
#
0d2cd91b |
| 29-Nov-2011 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v3.2-rc3' into next
|
#
d4bbf7e7 |
| 28-Nov-2011 |
Tejun Heo <tj@kernel.org> |
Merge branch 'master' into x86/memblock
Conflicts & resolutions:
* arch/x86/xen/setup.c
dc91c728fd "xen: allow extra memory to be in multiple regions" 24aa07882b "memblock, x86: Replace memblock
Merge branch 'master' into x86/memblock
Conflicts & resolutions:
* arch/x86/xen/setup.c
dc91c728fd "xen: allow extra memory to be in multiple regions" 24aa07882b "memblock, x86: Replace memblock_x86_reserve/free..."
conflicted on xen_add_extra_mem() updates. The resolution is trivial as the latter just want to replace memblock_x86_reserve_range() with memblock_reserve().
* drivers/pci/intel-iommu.c
166e9278a3f "x86/ia64: intel-iommu: move to drivers/iommu/" 5dfe8660a3d "bootmem: Replace work_with_active_regions() with..."
conflicted as the former moved the file under drivers/iommu/. Resolved by applying the chnages from the latter on the moved file.
* mm/Kconfig
6661672053a "memblock: add NO_BOOTMEM config symbol" c378ddd53f9 "memblock, x86: Make ARCH_DISCARD_MEMBLOCK a config option"
conflicted trivially. Both added config options. Just letting both add their own options resolves the conflict.
* mm/memblock.c
d1f0ece6cdc "mm/memblock.c: small function definition fixes" ed7b56a799c "memblock: Remove memblock_memory_can_coalesce()"
confliected. The former updates function removed by the latter. Resolution is trivial.
Signed-off-by: Tejun Heo <tj@kernel.org>
show more ...
|
#
dd7c7c3f |
| 27-Nov-2011 |
Greg Kroah-Hartman <gregkh@suse.de> |
Merge 3.2-rc3 into tty-next to handle merge conflict in tty_ldisc.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
#
47b64959 |
| 27-Nov-2011 |
Greg Kroah-Hartman <gregkh@suse.de> |
Merge 3.2-rc3 into usb-linus
This pulls in the latest USB bugfixes and helps a few of the drivers merge nicer in the future due to changes in both branches.
Signed-off-by: Greg Kroah-Hartman <gregk
Merge 3.2-rc3 into usb-linus
This pulls in the latest USB bugfixes and helps a few of the drivers merge nicer in the future due to changes in both branches.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
show more ...
|
#
27f6cbec |
| 25-Nov-2011 |
Wey-Yi Guy <wey-yi.w.guy@intel.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wireless-next
|
#
17f0056e |
| 24-Nov-2011 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'rmobile-fixes-for-linus' into rmobile-latest
|
#
52f3a41e |
| 23-Nov-2011 |
Tony Lindgren <tony@atomide.com> |
Merge branch 'fixes-v3.2-rc2' into fixes
|
#
12cbfd0a |
| 23-Nov-2011 |
Mauro Carvalho Chehab <mchehab@redhat.com> |
Merge tag 'v3.2-rc2' into staging/for_v3.3
* tag 'v3.2-rc2': (3068 commits) Linux 3.2-rc2 hfs: add sanity check for file name length fsl-rio: fix compile error blackfin: Fixup export.h inclu
Merge tag 'v3.2-rc2' into staging/for_v3.3
* tag 'v3.2-rc2': (3068 commits) Linux 3.2-rc2 hfs: add sanity check for file name length fsl-rio: fix compile error blackfin: Fixup export.h includes Blackfin: add serial TX IRQ in individual platform resource virtio-pci: fix use after free ACPI / cpuidle: Remove acpi_idle_suspend (to fix suspend regression) drm/radeon/kms/combios: fix dynamic allocation of PM clock modes [CPUFREQ] db8500: fix build error due to undeclared i variable bma023: Add SFI translation for this device vrtc: change its year offset from 1960 to 1972 ce4100: fix a build error arm/imx: fix imx6q mmc error when mounting rootfs arm/imx: fix AUTO_ZRELADDR selection arm/imx: fix the references to ARCH_MX3 ARM: mx51/53: set pwm clock parent to ipg_perclk btrfs: rename the option to nospace_cache drm/radeon/kms/pm: switch to dynamically allocating clock mode array drm/radeon/kms: optimize r600_pm_profile_init drm/radeon/kms/pm: add a proper pm profile init function for fusion ...
Conflicts: drivers/media/radio/Kconfig
show more ...
|
#
58a27374 |
| 23-Nov-2011 |
Arnd Bergmann <arnd@arndb.de> |
Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers
|
#
515db093 |
| 22-Nov-2011 |
John W. Linville <linville@tuxdriver.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Conflicts: drivers/net/wireless/iwlegacy/iwl-debugfs.c drivers/net/wireless/iwlegacy/iwl-rx.c drivers/net/wir
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Conflicts: drivers/net/wireless/iwlegacy/iwl-debugfs.c drivers/net/wireless/iwlegacy/iwl-rx.c drivers/net/wireless/iwlegacy/iwl-scan.c drivers/net/wireless/iwlegacy/iwl-tx.c include/net/bluetooth/bluetooth.h
show more ...
|
#
300e812d |
| 22-Nov-2011 |
Florian Tobias Schandinat <FlorianSchandinat@gmx.de> |
Merge commit 'v3.2-rc2' into fbdev-next
|