Revision tags: v2.6.37, v2.6.37-rc8, v2.6.37-rc7, v2.6.37-rc6, v2.6.37-rc5, v2.6.37-rc4, v2.6.37-rc3, v2.6.37-rc2, v2.6.37-rc1 |
|
#
b74b953b |
| 28-Oct-2010 |
Michal Marek <mmarek@suse.cz> |
Merge commit 'v2.6.36' into kbuild/misc
Update to be able to fix a recent change to scripts/basic/docproc.c (commit eda603f).
|
Revision tags: v2.6.36, v2.6.36-rc8, v2.6.36-rc7, v2.6.36-rc6, v2.6.36-rc5, v2.6.36-rc4, v2.6.36-rc3, v2.6.36-rc2, v2.6.36-rc1 |
|
#
11e4afb4 |
| 06-Aug-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branches 'gemini' and 'misc' into devel
|
#
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 |
|
#
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
|
Revision tags: v2.6.35-rc6, v2.6.35-rc5, v2.6.35-rc4 |
|
#
f1bbbb69 |
| 16-Jun-2010 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into for-next
|
Revision tags: v2.6.35-rc3, v2.6.35-rc2 |
|
#
d8a382d2 |
| 04-Jun-2010 |
Robert Richter <robert.richter@amd.com> |
Merge remote branch 'tip/perf/urgent' into oprofile/urgent
|
#
b42f5b0f |
| 02-Jun-2010 |
Len Brown <len.brown@intel.com> |
Merge branches 'bugzilla-14668' and 'misc-2.6.35' into release
|
#
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
|
Revision tags: v2.6.35-rc1 |
|
#
50d1e930 |
| 26-May-2010 |
Herbert Xu <herbert@gondor.apana.org.au> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/crypto-2.6
|
#
b1e50ebc |
| 25-May-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge remote branch 'origin' into secretlab/next-spi
|
#
1f782fee |
| 24-May-2010 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
#
cf9b59e9 |
| 22-May-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge remote branch 'origin' into secretlab/next-devicetree
Merging in current state of Linus' tree to deal with merge conflicts and build failures in vio.c after merge.
Conflicts: drivers/i2c/bus
Merge remote branch 'origin' into secretlab/next-devicetree
Merging in current state of Linus' tree to deal with merge conflicts and build failures in vio.c after merge.
Conflicts: drivers/i2c/busses/i2c-cpm.c drivers/i2c/busses/i2c-mpc.c drivers/net/gianfar.c
Also fixed up one line in arch/powerpc/kernel/vio.c to use the correct node pointer.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
show more ...
|
#
98edb6ca |
| 22-May-2010 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm
* 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (269 commits) KVM: x86: Add missing locking to a
Merge branch 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm
* 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (269 commits) KVM: x86: Add missing locking to arch specific vcpu ioctls KVM: PPC: Add missing vcpu_load()/vcpu_put() in vcpu ioctls KVM: MMU: Segregate shadow pages with different cr0.wp KVM: x86: Check LMA bit before set_efer KVM: Don't allow lmsw to clear cr0.pe KVM: Add cpuid.txt file KVM: x86: Tell the guest we'll warn it about tsc stability x86, paravirt: don't compute pvclock adjustments if we trust the tsc x86: KVM guest: Try using new kvm clock msrs KVM: x86: export paravirtual cpuid flags in KVM_GET_SUPPORTED_CPUID KVM: x86: add new KVMCLOCK cpuid feature KVM: x86: change msr numbers for kvmclock x86, paravirt: Add a global synchronization point for pvclock x86, paravirt: Enable pvclock flags in vcpu_time_info structure KVM: x86: Inject #GP with the right rip on efer writes KVM: SVM: Don't allow nested guest to VMMCALL into host KVM: x86: Fix exception reinjection forced to true KVM: Fix wallclock version writing race KVM: MMU: Don't read pdptrs with mmu spinlock held in mmu_alloc_roots KVM: VMX: enable VMXON check with SMX enabled (Intel TXT) ...
show more ...
|
Revision tags: v2.6.34, v2.6.34-rc7, v2.6.34-rc6, v2.6.34-rc5 |
|
#
53e5b8bb |
| 16-Apr-2010 |
Alexander Graf <agraf@suse.de> |
KVM: PPC: Make SLB switching code the new segment framework
We just introduced generic segment switching code that only needs to call small macros to do the actual switching, but keeps most of the e
KVM: PPC: Make SLB switching code the new segment framework
We just introduced generic segment switching code that only needs to call small macros to do the actual switching, but keeps most of the entry / exit code generic.
So let's move the SLB switching code over to use this new mechanism.
Signed-off-by: Alexander Graf <agraf@suse.de> Signed-off-by: Avi Kivity <avi@redhat.com>
show more ...
|
Revision tags: v2.6.34-rc4, v2.6.34-rc3 |
|
#
1bec1677 |
| 24-Mar-2010 |
Alexander Graf <agraf@suse.de> |
KVM: PPC: Make XER load 32 bit
We have a 32 bit value in the PACA to store XER in. We also do an stw when storing XER in there. But then we load it with ld, completely screwing it up on every entry.
KVM: PPC: Make XER load 32 bit
We have a 32 bit value in the PACA to store XER in. We also do an stw when storing XER in there. But then we load it with ld, completely screwing it up on every entry.
Welcome to the Big Endian world.
Signed-off-by: Alexander Graf <agraf@suse.de> Signed-off-by: Avi Kivity <avi@redhat.com>
show more ...
|
#
b65b3489 |
| 17-May-2010 |
Henrique de Moraes Holschuh <hmh@hmh.eng.br> |
Merge mainline (v2.6.34-rc7)
|
#
a9aa1d02 |
| 12-May-2010 |
Frederic Weisbecker <fweisbec@gmail.com> |
Merge commit 'v2.6.34-rc7' into perf/nmi
Merge reason: catch up with latest softlockup detector changes.
|
#
53ba4f2f |
| 03-May-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.34-rc6' into core/locking
|
#
df2071bd |
| 03-May-2010 |
Herbert Xu <herbert@gondor.apana.org.au> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
#
868c522b |
| 30-Apr-2010 |
Frederic Weisbecker <fweisbec@gmail.com> |
Merge commit 'v2.6.34-rc6' into core/locking
Merge reason: Further lockdep patches depend on per cpu updates made in -rc1.
|
#
d9c5841e |
| 30-Apr-2010 |
H. Peter Anvin <hpa@zytor.com> |
Merge branch 'x86/asm' into x86/atomic
Merge reason: Conflict between LOCK_PREFIX_HERE and relative alternatives pointers
Resolved Conflicts: arch/x86/include/asm/alternative.h arch/x86/kernel/
Merge branch 'x86/asm' into x86/atomic
Merge reason: Conflict between LOCK_PREFIX_HERE and relative alternatives pointers
Resolved Conflicts: arch/x86/include/asm/alternative.h arch/x86/kernel/alternative.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
show more ...
|
#
a36bf32e |
| 23-Apr-2010 |
Robert Richter <robert.richter@amd.com> |
Merge commit 'v2.6.34-rc5' into oprofile/core
|