summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* net: convert BUG_TRAP to generic WARN_ONIlpo Järvinen2008-07-251-2/+3
* ipsec: ipcomp - Merge IPComp implementationsHerbert Xu2008-07-251-0/+6
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-07-228-40/+35
|\
| * Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/...David S. Miller2008-07-221-4/+0
| |\
| | * fs_enet: Remove unused fields in the fs_mii_bb_platform_info structure.Laurent Pinchart2008-07-221-4/+0
| * | ipv6: icmp6_dst_gc return changeStephen Hemminger2008-07-221-1/+1
| * | netns: dont alloc ipv6 fib timer listStephen Hemminger2008-07-221-1/+1
| * | ipv6: make struct ipv6_devconf staticAdrian Bunk2008-07-221-2/+0
| * | sctp: make sctp_outq_flush() staticAdrian Bunk2008-07-221-1/+0
| * | netns: make get_proc_net() staticAdrian Bunk2008-07-221-2/+0
| * | net: Fix build failure with 'make mandocs'.Dave Jones2008-07-221-29/+29
| |/
| * ipv6: __KERNEL__ ifdef struct ipv6_devconfDavid S. Miller2008-07-211-0/+2
| * net: Print the module name as part of the watchdog messageArjan van de Ven2008-07-211-0/+2
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2008-07-225-219/+99
|\ \
| * | 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-227-17/+28
|\ \ \
| * | | x86: add PTE_FLAGS_MASKJeremy Fitzhardinge2008-07-223-3/+6
| * | | x86: rename PTE_MASK to PTE_PFN_MASKJeremy Fitzhardinge2008-07-227-18/+18
| * | | x86: fix pte_flags() to only return flags, fix lguest (updated)Rusty Russell2008-07-222-1/+9
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linusLinus Torvalds2008-07-222-25/+30
|\ \ \ \
| * | | | remove CONFIG_KMOD from core kernel codeJohannes Berg2008-07-221-1/+1
| * | | | rework try_then_request_module to do less in non-modular kernelsJohannes Berg2008-07-221-1/+2
| * | | | module: turn longs into ints for module sizesDenys Vlasenko2008-07-221-3/+3
| * | | | Shrink struct module: CONFIG_UNUSED_SYMBOLS ifdefsDenys Vlasenko2008-07-221-0/+2
| * | | | module: reorder struct module to save space on 64 bit buildsRichard Kennedy2008-07-221-20/+22
* | | | | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po...Linus Torvalds2008-07-2212-33/+42
|\ \ \ \ \
| * \ \ \ \ Merge commit 'origin/master'Benjamin Herrenschmidt2008-07-22711-29646/+33921
| |\ \ \ \ \ | | |/ / / /
| * | | | | powerpc/cell: Add DMA_ATTR_WEAK_ORDERING dma attribute and use in Cell IOMMU ...Mark Nelson2008-07-221-0/+1
| * | | | | 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/ps3: Add a sub-match id to ps3_system_busMasakazu Mokuno2008-07-221-0/+7
| * | | | | powerpc/dma: Use the struct dma_attrs in iommu codeMark Nelson2008-07-221-1/+2
| * | | | | powerpc/cell: Add support for power button of future IBM cell bladesChristian Krafft2008-07-221-0/+1
| * | | | | of_gpio: Should use new <linux/gpio.h> headerWolfgang Grandegger2008-07-221-1/+1
| * | | | | powerpc: rework FSL Book-E PTE access and TLB missKumar Gala2008-07-161-11/+4
| * | | | | fs_enet: Remove !CONFIG_PPC_CPM_NEW_BINDING codeKumar Gala2008-07-161-4/+0
| * | | | | gianfar: Add magic packet and suspend/resume support.Scott Wood2008-07-161-0/+1
| * | | | | powerpc: Fix a bunch of sparse warnings in the qe_libAndy Fleming2008-07-161-4/+4
| * | | | | powerpc/mpc83xx: Power Management supportScott Wood2008-07-162-0/+10
* | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6Linus Torvalds2008-07-2213-37/+101
|\ \ \ \ \ \
| * | | | | | MTD: handle pci_name() being constGreg Kroah-Hartman2008-07-212-2/+2
| * | | | | | sysdev: Add utility functions for simple int/ulong variable sysdev attributesAndi Kleen2008-07-211-0/+34
| * | | | | | sysdev: Pass the attribute to the low level sysdev show/store functionAndi Kleen2008-07-211-2/+3
| * | | | | | driver core: Suppress sysfs warnings for device_rename().Cornelia Huck2008-07-211-0/+10
| * | | | | | debugfs: Implement debugfs_remove_recursive()Haavard Skinnemoen2008-07-211-0/+4
OpenPOWER on IntegriCloud