|
Revision tags: v2.6.36-rc1 |
|
| #
11e4afb4 |
| 06-Aug-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branches 'gemini' and 'misc' into devel
|
| #
d790d4d5 |
| 04-Aug-2010 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into for-next
|
| #
7a996d3a |
| 04-Aug-2010 |
Michal Marek <mmarek@suse.cz> |
Merge commit 'v2.6.35' into kbuild/kconfig
Conflicts:
scripts/kconfig/Makefile
|
| #
772320e8 |
| 04-Aug-2010 |
Michal Marek <mmarek@suse.cz> |
Merge commit 'v2.6.35' into kbuild/kbuild
Conflicts:
arch/powerpc/Makefile
|
|
Revision tags: v2.6.35 |
|
| #
7d50d07d |
| 28-Jul-2010 |
H. Peter Anvin <hpa@linux.intel.com> |
Merge remote branch 'linus/master' into x86/cpu
|
| #
800f65bb |
| 27-Jul-2010 |
John W. Linville <linville@tuxdriver.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-commands.h
|
| #
4708ac49 |
| 27-Jul-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'origin' into misc
|
| #
5ffdcd94 |
| 25-Jul-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.35-rc6' into spi/test
|
| #
4e4f62bf |
| 24-Jul-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.35-rc6' into devicetree/next
Conflicts:
arch/sparc/kernel/prom_64.c
|
|
Revision tags: v2.6.35-rc6 |
|
| #
dca45ad8 |
| 21-Jul-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into sched/core
Merge reason: Move from the -rc3 to the almost-rc6 base.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
14764b01 |
| 21-Jul-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable
|
|
Revision tags: v2.6.35-rc5 |
|
| #
a2262d8a |
| 06-Jul-2010 |
Chris Metcalf <cmetcalf@tilera.com> |
Merge branch 'master' into for-linus
|
| #
285eba57 |
| 05-Jul-2010 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/linux/serial_sci.h
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
|
|
Revision tags: v2.6.35-rc4 |
|
| #
12462d77 |
| 01-Jul-2010 |
Paul Mundt <lethal@linux-sh.org> |
Merge branches 'sh/highmem' and 'sh/stable-updates'
|
| #
0a54cec0 |
| 01-Jul-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/rcu
Conflicts:
fs/fs-writeback.c
Merge reason: Resolve the conflict
Note, i picked the version from Linus's tree, which effectively reverts
the fs-writeback.c bits
Merge branch 'linus' into core/rcu
Conflicts:
fs/fs-writeback.c
Merge reason: Resolve the conflict
Note, i picked the version from Linus's tree, which effectively reverts
the fs-writeback.c bits of:
b97181f: fs: remove all rcu head initializations, except on_stack initializations
As the upstream changes to this file changed this code heavily and the
first attempt to resolve the conflict resulted in a non-booting kernel.
It's safer to re-try this portion of the commit cleanly.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
show more ...
|
| #
f384c954 |
| 28-Jun-2010 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'linus' into perf/core
Reason: Further changes conflict with upstream fixes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
| #
ddc39f90 |
| 27-Jun-2010 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
alpha: Fix de2104x d
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
alpha: Fix de2104x driver failing to readout MAC address correctly
alpha: Detect Super IO chip, no IDE on Avanti, enable EPP19
alpha: fix pci_mmap_resource API breakage
alpha: fix __arch_hweight32 typo
show more ...
|
| #
f1bbbb69 |
| 16-Jun-2010 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into for-next
|
|
Revision tags: v2.6.35-rc3 |
|
| #
87a9d57d |
| 06-Jun-2010 |
Matt Turner <mattst88@gmail.com> |
alpha: fix __arch_hweight32 typo
Typo in 1527bc8b928dd1399c3d3467dd47d9ede210978a renamed hweight32 to
__arch_weight32.
Signed-off-by: Matt Turner <mattst88@gmail.com>
|
|
Revision tags: v2.6.35-rc2 |
|
| #
d8a382d2 |
| 04-Jun-2010 |
Robert Richter <robert.richter@amd.com> |
Merge remote branch 'tip/perf/urgent' into oprofile/urgent
|
| #
b42f5b0f |
| 01-Jun-2010 |
Len Brown <len.brown@intel.com> |
Merge branches 'bugzilla-14668' and 'misc-2.6.35' into release
|
| #
b4ca7615 |
| 01-Jun-2010 |
Jens Axboe <jaxboe@fusionio.com> |
Merge branch 'master' into for-linus
Conflicts:
fs/pipe.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
|
| #
1d61e73a |
| 01-Jun-2010 |
Joerg Roedel <joerg.roedel@amd.com> |
Merge commit 'v2.6.35-rc1' into amd-iommu/2.6.35
|
| #
64960848 |
| 31-May-2010 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
| #
e37c83c0 |
| 31-May-2010 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge commit 'v2.6.35-rc1' into for-2.6.36
|