summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
*-. Merge branches 'ns9x' and 'machtypes' into develRussell King2008-07-074-64/+151
|\ \
| | * [ARM] mach-types updateRussell King2008-07-071-17/+109
| * | Merge branch 'atags' into for-rmkUwe Kleine-König2008-05-302-45/+40
| |\ \
| | * | clean up atags exporting codeUwe Kleine-König2008-05-301-41/+39
| | * | There is no need to have BOOT_PARAMS_SIZE known outside of atags.cUwe Kleine-König2008-05-302-6/+3
| * | | ns9xxx: fix assembler version of __REG2 to be consistent with the C versionUwe Kleine-König2008-05-301-2/+2
| |/ /
* | | Merge branch 'fb' into develRussell King2008-07-0310-124/+3
|\ \ \ | |_|/ |/| |
| * | [ARM] 5015/1: arm: remove ARCH_CO285Adrian Bunk2008-05-0210-125/+3
* | | Linux 2.6.26-rc8v2.6.26-rc8Linus Torvalds2008-06-241-1/+1
* | | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/...Linus Torvalds2008-06-243-5/+2
|\ \ \
| * | | [IA64] Eliminate NULL test after alloc_bootmem in iosapic_alloc_rte()Julia Lawall2008-06-241-2/+0
| * | | [IA64] Handle count==0 in sn2_ptc_proc_write()Cliff Wickman2008-06-241-1/+1
| * | | [IA64] Fix boot failure on ia64/sn2Jes Sorensen2008-06-241-2/+1
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixesLinus Torvalds2008-06-242-15/+10
|\ \ \ \
| * | | | [GFS2] fix gfs2 block allocation (cleaned up)Benjamin Marzinski2008-06-241-14/+9
| * | | | [GFS2] BUG: unable to handle kernel paging request at ffff81002690e000Bob Peterson2008-06-241-1/+1
| |/ / /
* | | | Merge branch 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2008-06-2418-266/+358
|\ \ \ \
| * | | | KVM: Remove now unused structs from kvm_para.hGerd Hoffmann2008-06-241-18/+0
| * | | | x86: KVM guest: Use the paravirt clocksource structs and functionsGerd Hoffmann2008-06-242-56/+34
| * | | | KVM: Make kvm host use the paravirt clocksource structsGerd Hoffmann2008-06-242-14/+65
| * | | | x86: Make xen use the paravirt clocksource structs and functionsGerd Hoffmann2008-06-243-124/+16
| * | | | x86: Add structs and functions for paravirt clocksourceGerd Hoffmann2008-06-245-0/+201
| * | | | KVM: VMX: Fix host msr corruption with preemption enabledAvi Kivity2008-06-241-8/+11
| * | | | KVM: ioapic: fix lost interrupt when changing a device's irqAvi Kivity2008-06-241-20/+11
| * | | | KVM: MMU: Fix oops on guest userspace access to guest pagetableAvi Kivity2008-06-241-6/+0
| * | | | KVM: MMU: large page update_pte issue with non-PAE 32-bit guests (resend)Marcelo Tosatti2008-06-241-5/+7
| * | | | KVM: MMU: Fix rmap_write_protect() hugepage iteration bugMarcelo Tosatti2008-06-241-0/+1
| * | | | KVM: close timer injection race window in __vcpu_runMarcelo Tosatti2008-06-244-3/+9
| * | | | KVM: Fix race between timer migration and vcpu migrationMarcelo Tosatti2008-06-241-12/+3
| |/ / /
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdogLinus Torvalds2008-06-241-1/+0
|\ \ \ \
| * | | | Revert "[WATCHDOG] hpwdt: Add CFLAGS to get driver working"Wim Van Sebroeck2008-06-241-1/+0
| |/ / /
* | | | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2008-06-246-77/+27
|\ \ \ \
| * | | | xen: remove support for non-PAE 32-bitJeremy Fitzhardinge2008-06-246-77/+27
* | | | | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwe...Linus Torvalds2008-06-242-15/+8
|\ \ \ \ \
| * | | | | kgdb: sparse fixJason Wessel2008-06-241-1/+2
| * | | | | kgdb: documentation update - remove kgdboeJason Wessel2008-06-241-14/+6
| | |/ / / | |/| | |
* | | | | enable bus mastering on i915 at resume timeJie Luo2008-06-241-0/+1
* | | | | alpha: fix compile error in arch/alpha/mm/init.cThorsten Kranzkowski2008-06-231-0/+2
|/ / / /
* | | | Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds2008-06-233-37/+51
|\ \ \ \
| * | | | NFS: nfs_updatepage(): don't mark page as dirty if an error occurredTrond Myklebust2008-06-231-3/+4
| * | | | NFS: Fix filehandle size comparisons in the mount codeTrond Myklebust2008-06-232-6/+7
| * | | | NFS: Reduce the NFS mount code stack usage.Trond Myklebust2008-06-231-28/+40
* | | | | Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2008-06-231-20/+73
|\ \ \ \ \
| * | | | | futexes: fix fault handling in futex_lock_piThomas Gleixner2008-06-231-20/+73
* | | | | | Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2008-06-232-9/+8
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'linus' into sched/urgentIngo Molnar2008-06-2389-1562/+3293
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | sched: refactor wait_for_completion_timeout()Oleg Nesterov2008-06-201-18/+6
| * | | | | | sched: fix wait_for_completion_timeout() spurious failure under heavy loadRoland Dreier2008-06-201-0/+10
| * | | | | | sched: rt: dont stop the period timer when there are tasks wanting to runPeter Zijlstra2008-06-201-1/+2
* | | | | | | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2008-06-235-34/+46
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
OpenPOWER on IntegriCloud