summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6Linus Torvalds2008-10-204-32/+27
|\
| * ide: remove unused macros from <asm-parisc/ide.h>Bartlomiej Zolnierkiewicz2008-10-171-4/+0
| * ide: remove M68K_IDE_SWAPW define from <asm-m68k/ide.h>Bartlomiej Zolnierkiewicz2008-10-171-9/+0
| * ide: fix support for IDE PCI controllers using MMIO on frvBartlomiej Zolnierkiewicz2008-10-171-9/+1
| * ide: add generic ATA/ATAPI disk driverBartlomiej Zolnierkiewicz2008-10-171-0/+19
| * ide: allow device drivers to specify per-device type /proc settingsBartlomiej Zolnierkiewicz2008-10-171-2/+2
| * ide: remove IDE_AFLAG_NO_DOORLOCKINGBartlomiej Zolnierkiewicz2008-10-171-2/+0
| * ide: IDE_AFLAG_FORMAT_IN_PROGRESS -> IDE_DFLAG_FORMAT_IN_PROGRESSBartlomiej Zolnierkiewicz2008-10-171-2/+1
| * ide: IDE_AFLAG_WP -> IDE_DFLAG_WPBartlomiej Zolnierkiewicz2008-10-171-2/+2
| * ide: IDE_AFLAG_MEDIA_CHANGED -> IDE_DFLAG_MEDIA_CHANGEDBartlomiej Zolnierkiewicz2008-10-171-2/+2
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/msz...Linus Torvalds2008-10-201-1/+11
|\ \
| * | fuse: implement nonseekable openTejun Heo2008-10-161-1/+6
| * | fuse: add include protectorsTejun Heo2008-10-161-0/+5
* | | Merge git://git.infradead.org/battery-2.6Linus Torvalds2008-10-201-0/+6
|\ \ \
| * \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...Anton Vorontsov2008-10-181158-67424/+17652
| |\ \ \
| * | | | power_supply: Add function to return system-wide power stateMatthew Garrett2008-09-011-0/+6
* | | | | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/eric...Linus Torvalds2008-10-203-160/+138
|\ \ \ \ \
| * | | | | 9p: Improve debug supportEric Van Hensbergen2008-10-171-2/+2
| * | | | | 9p: eliminate depricated conv functionsEric Van Hensbergen2008-10-172-97/+12
| * | | | | 9p: rework client code to use new protocol support functionsEric Van Hensbergen2008-10-172-3/+11
| * | | | | 9p: remove unnecessary tag field from p9_req_t structureEric Van Hensbergen2008-10-171-2/+0
| * | | | | 9p: remove 9p fcall debug printsEric Van Hensbergen2008-10-171-1/+0
| * | | | | 9p: add new protocol support codeEric Van Hensbergen2008-10-171-1/+7
| * | | | | 9p: move dirread to fs layerEric Van Hensbergen2008-10-171-5/+0
| * | | | | 9p: move readn meta-function from client to fs layerEric Van Hensbergen2008-10-171-1/+0
| * | | | | 9p: consolidate read/write functionsEric Van Hensbergen2008-10-171-6/+4
| * | | | | 9p: make rpc code common and rework flush codeEric Van Hensbergen2008-10-172-6/+5
| * | | | | 9p: apply common request code to trans_fdEric Van Hensbergen2008-10-171-1/+9
| * | | | | 9p: move request management to client codeEric Van Hensbergen2008-10-171-0/+77
| * | | | | 9p: consolidate transport structureEric Van Hensbergen2008-10-172-49/+25
| | |_|_|/ | |/| | |
* | | | | Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds2008-10-201-2/+6
|\ \ \ \ \
| * | | | | Make nfs_file_cred more robust.Neil Brown2008-10-171-2/+6
| |/ / / /
* | | | | Merge branch 'for-next' of git://git.o-hand.com/linux-mfdLinus Torvalds2008-10-205-7/+555
|\ \ \ \ \
| * | | | | mfd: update TMIO drivers to use the clock APIIan Molton2008-10-192-5/+0
| * | | | | mfd: add base support for Dialog DA9030/DA9034 PMICsEric Miao2008-10-191-0/+201
| * | | | | mfd: TWL4030 core driverDavid Brownell2008-10-191-0/+339
| * | | | | mfd: support tmiofb cell on tc6393xbDmitry Baryshkov2008-10-191-0/+8
| * | | | | mfd: add OHCI cell to tc6393xbDmitry Baryshkov2008-10-191-0/+1
| * | | | | mfd: do tcb6393xb state restore on resume only if requestedDmitry Baryshkov2008-10-191-0/+4
| * | | | | mfd: provide and use setup hook for tc6393xbDmitry Baryshkov2008-10-191-2/+2
| | |_|/ / | |/| | |
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2008-10-202-0/+169
|\ \ \ \ \
| * | | | | video: add sh_mobile_lcdc platform flagsMagnus Damm2008-10-201-0/+7
| * | | | | video: remove unused sh_mobile_lcdc platform dataMagnus Damm2008-10-201-1/+0
| * | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...Paul Mundt2008-10-201148-67391/+17599
| |\| | | |
| * | | | | video: sh_mobile_lcdcfb: Support HAVE_CLK=n configurations.Paul Mundt2008-10-011-0/+72
| * | | | | sh: Move the shared INTC code out to drivers/sh/Paul Mundt2008-10-011-0/+91
* | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-10-201-2/+2
|\ \ \ \ \ \
| * | | | | | netfilter: netns: use NFPROTO_NUMPROTO instead of NUMPROTO for tables arrayPatrick McHardy2008-10-201-2/+2
* | | | | | | Merge git://git.infradead.org/mtd-2.6Linus Torvalds2008-10-209-3/+164
|\ \ \ \ \ \ \
| * | | | | | | [MTD] [NAND] GPIO NAND flash driverMike Rapoport2008-10-181-0/+19