summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2008-07-226-219/+100
|\
| * sparc32: pass -m32 when building vmlinux.ldsStephen Rothwell2008-07-221-0/+1
| * sparc: Fixes the DRM layer build on sparc.David S. Miller2008-07-222-0/+2
| * ide: merge <asm-sparc/ide_64.h> with <asm-sparc/ide_32.h>Bartlomiej Zolnierkiewicz2008-07-213-190/+97
| * ide: <asm-sparc/ide_64.h>: use __raw_{read,write}w()Bartlomiej Zolnierkiewicz2008-07-211-26/+8
| * ide: <asm-sparc/ide_32.h>: use __raw_{read,write}w()Bartlomiej Zolnierkiewicz2008-07-211-20/+10
| * ide: <asm-sparc/ide_64.h>: use %r0 for outw_be()Bartlomiej Zolnierkiewicz2008-07-211-2/+2
| * sparc64: Do not define BIO_VMERGE_BOUNDARY.David S. Miller2008-07-211-1/+0
* | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2008-07-2214-34/+45
|\ \
| * | x86: fix crash due to missing debugctlmsr on AMD K6-3Jan Kratochvil2008-07-221-1/+1
| * | x86: add PTE_FLAGS_MASKJeremy Fitzhardinge2008-07-225-8/+11
| * | x86: rename PTE_MASK to PTE_PFN_MASKJeremy Fitzhardinge2008-07-2210-28/+28
| * | x86: fix pte_flags() to only return flags, fix lguest (updated)Rusty Russell2008-07-223-2/+10
| * | x86: use setup_clear_cpu_cap with disable_apic, fixYinghai Lu2008-07-221-1/+1
| * | x86: move the last Dprintk instance to pr_debug()Thomas Gleixner2008-07-211-4/+4
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linusLinus Torvalds2008-07-2216-202/+259
|\ \ \
| * | | remove CONFIG_KMOD from core kernel codeJohannes Berg2008-07-224-5/+5
| * | | remove CONFIG_KMOD from libJohannes Berg2008-07-221-1/+1
| * | | remove CONFIG_KMOD from sparc64Johannes Berg2008-07-222-6/+3
| * | | rework try_then_request_module to do less in non-modular kernelsJohannes Berg2008-07-221-1/+2
| * | | remove mention of CONFIG_KMOD from documentationJohannes Berg2008-07-226-23/+13
| * | | make CONFIG_KMOD invisibleJohannes Berg2008-07-221-8/+3
| * | | modules: Take a shortcut for checking if an address is in a moduleRusty Russell2008-07-221-2/+22
| * | | module: turn longs into ints for module sizesDenys Vlasenko2008-07-222-5/+5
| * | | Shrink struct module: CONFIG_UNUSED_SYMBOLS ifdefsDenys Vlasenko2008-07-223-17/+38
| * | | module: reorder struct module to save space on 64 bit buildsRichard Kennedy2008-07-221-20/+22
| * | | module: generic each_symbol iterator functionRusty Russell2008-07-221-110/+134
| * | | module: don't use stop_machine for waiting rmmodRusty Russell2008-07-221-4/+11
* | | | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po...Linus Torvalds2008-07-22111-1612/+6416
|\ \ \ \
| * \ \ \ Merge commit 'origin/master'Benjamin Herrenschmidt2008-07-222632-125498/+205619
| |\ \ \ \ | | |/ / /
| * | | | powerpc: Fix build bug with binutils < 2.18 and GCC < 4.2Segher Boessenkool2008-07-221-3/+28
| * | | | powerpc/eeh: Don't panic when EEH_MAX_FAILS is exceededMike Mason2008-07-221-14/+12
| * | | | fbdev: Teaches offb about palette on radeon r5xx/r6xxBenjamin Herrenschmidt2008-07-221-50/+142
| * | | | powerpc/cell/edac: Log a syndrome code in case of correctable errorMaxim Shchetynin2008-07-221-2/+3
| * | | | powerpc/cell: Add DMA_ATTR_WEAK_ORDERING dma attribute and use in Cell IOMMU ...Mark Nelson2008-07-223-5/+118
| * | | | powerpc: Indicate which oprofile counters to use while in compat modeTorez Smith2008-07-221-0/+20
| * | | | powerpc/boot: Change spaces to tabsAdrian Bunk2008-07-221-2/+2
| * | | | powerpc: Remove duplicate 6xx option in KconfigAdrian Bunk2008-07-221-3/+0
| * | | | powerpc: Use PPC_LONG and PPC_LONG_ALIGN in lib/string.SMichael Ellerman2008-07-221-12/+6
| * | | | powerpc: Use PPC_LONG_ALIGN in uaccess.hMichael Ellerman2008-07-221-12/+9
| * | | | powerpc: Add a #define for aligning to a long-sized boundaryMichael Ellerman2008-07-221-0/+2
| * | | | powerpc: Fix OF parsing of 64 bits PCI addressesBenjamin Herrenschmidt2008-07-222-20/+25
| * | | | powerpc: Use WARN_ON(1) instead of __WARN()Michael Ellerman2008-07-221-1/+1
| * | | | powerpc: Fix support for latencytopArnd Bergmann2008-07-221-1/+1
| * | | | powerpc/ps3: Update ps3_defconfigGeoff Levand2008-07-221-74/+122
| * | | | powerpc/ps3: Add a sub-match id to ps3_system_busMasakazu Mokuno2008-07-224-7/+23
| * | | | powerpc: Add a 6xx defconfigKumar Gala2008-07-221-0/+3304
| * | | | powerpc/dma: Use the struct dma_attrs in iommu codeMark Nelson2008-07-227-16/+28
| * | | | powerpc/cell: Add support for power button of future IBM cell bladesChristian Krafft2008-07-224-0/+128
| * | | | powerpc/cell: Cleanup sysreset_hack for IBM cell bladesChristian Krafft2008-07-224-26/+64
OpenPOWER on IntegriCloud