summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | powerpc/cell/cpufreq: Add spu aware cpufreq governorChristian Krafft2008-07-223-0/+194
| * | powerpc/axonram: Enable partitioning of the Axons DDR2 DIMMsMaxim Shchetynin2008-07-221-1/+4
| * | powerpc/axonram: Use only one block device major numberMaxim Shchetynin2008-07-221-8/+15
| * | of_gpio: Should use new <linux/gpio.h> headerWolfgang Grandegger2008-07-221-1/+1
| * | powerpc: fix ALSA options in Freescale 85xx and 86xx defconfigsTimur Tabi2008-07-164-12/+20
| * | Revert "powerpc/ep8248e: Fix compile problem if !CONFIG_FS_ENET"Kumar Gala2008-07-161-4/+0
| * | powerpc/ep8248e: Unconditionally select PHYLIB for mdio_bitbangKumar Gala2008-07-161-0/+1
| * | powerpc/fsl: Minor TLBSYNC cleanup for FSL Book-EKumar Gala2008-07-161-15/+4
| * | powerpc: rework FSL Book-E PTE access and TLB missKumar Gala2008-07-162-135/+48
| * | powerpc: Remove Kconfig PPC_CPM_NEW_BINDINGKumar Gala2008-07-162-6/+0
| * | fs_enet: Remove !CONFIG_PPC_CPM_NEW_BINDING codeKumar Gala2008-07-169-696/+5
| * | Add fsl,magic-packet to, and clean up, the gianfar binding.Scott Wood2008-07-161-19/+12
| * | gianfar: Add magic packet and suspend/resume support.Scott Wood2008-07-165-6/+173
| * | powerpc: Fix a bunch of sparse warnings in the qe_libAndy Fleming2008-07-164-18/+18
| * | powerpc: Add support for multiple gfar mdio interfacesAndy Fleming2008-07-161-46/+38