#
554738da |
| 07-Jan-2011 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge branch 'next' into for-linus
Conflicts: include/linux/input.h
|
#
4ec3eb13 |
| 06-Jan-2011 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'smp' into misc
Conflicts: arch/arm/kernel/entry-armv.S arch/arm/mm/ioremap.c
|
Revision tags: v2.6.37 |
|
#
bc030d6c |
| 04-Jan-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.37-rc8' into x86/apic
Conflicts: arch/x86/include/asm/io_apic.h
Merge reason: move to a fresh -rc, resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
d392da52 |
| 30-Dec-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge v2.6.37-rc8 into powerpc/next
|
Revision tags: v2.6.37-rc8 |
|
#
cfb13c5d |
| 23-Dec-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.37-rc7' into devicetree/next
|
#
4b7bd364 |
| 22-Dec-2010 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into for-next
Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c
Needed to update to apply fixes for which the old branch was too outdated.
|
#
752a4a95 |
| 22-Dec-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.37-rc7' into spi/next
|
Revision tags: v2.6.37-rc7, v2.6.37-rc6 |
|
#
354d14b3 |
| 13-Dec-2010 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/workq-update' into topic/misc
|
#
2ade0c1d |
| 10-Dec-2010 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into upstream
|
#
d834a9dc |
| 09-Dec-2010 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'x86/amd-nb' into x86/apic-cleanups
Reason: apic cleanup series depends on x86/apic, x86/amd-nb x86/platform
Conflicts: arch/x86/include/asm/io_apic.h
Signed-off-by: Thomas Gleixner
Merge branch 'x86/amd-nb' into x86/apic-cleanups
Reason: apic cleanup series depends on x86/apic, x86/amd-nb x86/platform
Conflicts: arch/x86/include/asm/io_apic.h
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
show more ...
|
Revision tags: v2.6.37-rc5 |
|
#
30799105 |
| 01-Dec-2010 |
Michal Marek <mmarek@suse.cz> |
Merge branch 'kconfig_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next into kbuild/rc-fixes
|
#
7d0dbea3 |
| 30-Nov-2010 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'sh/urgent' into sh-latest
|
Revision tags: v2.6.37-rc4 |
|
#
ca19e77e |
| 29-Nov-2010 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/hda' into topic/hda
|
#
1d6d7568 |
| 28-Nov-2010 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
#
b03a6c4c |
| 24-Nov-2010 |
Chris Metcalf <cmetcalf@tilera.com> |
Merge branch 'master' into for-linus
|
#
9b832153 |
| 22-Nov-2010 |
Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> |
Merge branches 'upstream/core', 'upstream/xenfs' and 'upstream/evtchn' into upstream/for-linus
* upstream/core: xen/events: Use PIRQ instead of GSI value when unmapping MSI/MSI-X irqs. xen: set
Merge branches 'upstream/core', 'upstream/xenfs' and 'upstream/evtchn' into upstream/for-linus
* upstream/core: xen/events: Use PIRQ instead of GSI value when unmapping MSI/MSI-X irqs. xen: set IO permission early (before early_cpu_init()) xen: re-enable boot-time ballooning xen/balloon: make sure we only include remaining extra ram xen/balloon: the balloon_lock is useless xen: add extra pages to balloon xen/events: use locked set|clear_bit() for cpu_evtchn_mask xen/evtchn: clear secondary CPUs' cpu_evtchn_mask[] after restore xen: implement XENMEM_machphys_mapping
* upstream/xenfs: Revert "xen/privcmd: create address space to allow writable mmaps" xen/xenfs: update xenfs_mount for new prototype xen: fix header export to userspace xen: set vma flag VM_PFNMAP in the privcmd mmap file_op xen: xenfs: privcmd: check put_user() return code
* upstream/evtchn: xen: make evtchn's name less generic xen/evtchn: the evtchn device is non-seekable xen/evtchn: add missing static xen/evtchn: Fix name of Xen event-channel device xen/evtchn: don't do unbind_from_irqhandler under spinlock xen/evtchn: remove spurious barrier xen/evtchn: ports start enabled xen/evtchn: dynamically allocate port_user array xen/evtchn: track enabled state for each port
show more ...
|
Revision tags: v2.6.37-rc3 |
|
#
9e18e186 |
| 19-Nov-2010 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'next-samsung-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into for-2.6.38
|
#
fe040be2 |
| 19-Nov-2010 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'common/fbdev-mipi' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
|
#
92fd4d4d |
| 18-Nov-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.37-rc2' into sched/core
Merge reason: Move to a .37-rc base.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
0421860a |
| 18-Nov-2010 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'rmobile/ag5' into rmobile-latest
|
#
14c05aa3 |
| 17-Nov-2010 |
Greg Kroah-Hartman <gregkh@suse.de> |
Driver core: Merge 2.6.37-rc2 into driver-core-next
This resolves some build issues that were present in the older -rc1 tree that kept bothering me.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.d
Driver core: Merge 2.6.37-rc2 into driver-core-next
This resolves some build issues that were present in the older -rc1 tree that kept bothering me.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
show more ...
|
#
20b4755e |
| 16-Nov-2010 |
Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> |
Merge commit 'v2.6.37-rc2' into upstream/xenfs
* commit 'v2.6.37-rc2': (10093 commits) Linux 2.6.37-rc2 capabilities/syslog: open code cap_syslog logic to fix build failure i2c: Sanity checks
Merge commit 'v2.6.37-rc2' into upstream/xenfs
* commit 'v2.6.37-rc2': (10093 commits) Linux 2.6.37-rc2 capabilities/syslog: open code cap_syslog logic to fix build failure i2c: Sanity checks on adapter registration i2c: Mark i2c_adapter.id as deprecated i2c: Drivers shouldn't include <linux/i2c-id.h> i2c: Delete unused adapter IDs i2c: Remove obsolete cleanup for clientdata include/linux/kernel.h: Move logging bits to include/linux/printk.h Fix gcc 4.5.1 miscompiling drivers/char/i8k.c (again) hwmon: (w83795) Check for BEEP pin availability hwmon: (w83795) Clear intrusion alarm immediately hwmon: (w83795) Read the intrusion state properly hwmon: (w83795) Print the actual temperature channels as sources hwmon: (w83795) List all usable temperature sources hwmon: (w83795) Expose fan control method hwmon: (w83795) Fix fan control mode attributes hwmon: (lm95241) Check validity of input values hwmon: Change mail address of Hans J. Koch PCI: sysfs: fix printk warnings GFS2: Fix inode deallocation race ...
show more ...
|
#
491acf00 |
| 16-Nov-2010 |
Greg Kroah-Hartman <gregkh@suse.de> |
Staging: Merge 2.6.37-rc2 into staging-next
This was necessary in order to resolve some conflicts that happened between -rc1 and -rc2 with the following files: drivers/staging/bcm/Bcmchar.c drive
Staging: Merge 2.6.37-rc2 into staging-next
This was necessary in order to resolve some conflicts that happened between -rc1 and -rc2 with the following files: drivers/staging/bcm/Bcmchar.c drivers/staging/intel_sst/intel_sst_app_interface.c
All should be resolved now.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
show more ...
|
#
a0205634 |
| 16-Nov-2010 |
Jens Axboe <jaxboe@fusionio.com> |
Merge branch 'v2.6.37-rc2' into for-2.6.38/core
|
Revision tags: v2.6.37-rc2 |
|
#
c94f28c3 |
| 15-Nov-2010 |
Chris Wilson <chris@chris-wilson.co.uk> |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts: drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/intel_ringbuffer.c
|