summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.infradead.org/~dwmw2/battery-2.6Linus Torvalds2007-07-1021-0/+2958
|\
| * [BATTERY] ds2760 W1 slaveAnton Vorontsov2007-07-105-0/+278
| * [BATTERY] One Laptop Per Child power/battery driverDavid Woodhouse2007-07-103-0/+359
| * [BATTERY] Apple PMU driverDavid Woodhouse2007-07-103-0/+223
| * [BATTERY] 1-Wire ds2760 chip battery driverAnton Vorontsov2007-07-103-0/+479
| * [BATTERY] APM emulation driver for class batteriesAnton Vorontsov2007-07-103-0/+251
| * [BATTERY] pda_power platform driverAnton Vorontsov2007-07-104-0/+301
| * [BATTERY] Universal power supply class (was: battery class)Anton Vorontsov2007-07-1010-0/+1067
* | Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6Linus Torvalds2007-07-1031-348/+459
|\ \
| * | [S390] vmlogrdr function annotation.Christian Borntraeger2007-07-101-2/+2
| * | [S390] s390: rename CPU_IDLE to S390_CPU_IDLEHeiko Carstens2007-07-104-9/+9
| * | [S390] cio: Remove prototype for non-existing function cmf_reset().Cornelia Huck2007-07-101-1/+0
| * | [S390] zcrypt: fix request timeout handlingRalph Wuerthner2007-07-106-90/+140
| * | [S390] system call optimization.Martin Schwidefsky2007-07-102-2/+12
| * | [S390] dasd: Avoid compile warnings on !CONFIG_DASD_PROFILEHeiko Carstens2007-07-101-0/+4
| * | [S390] Remove volatile from atomic_tHeiko Carstens2007-07-101-2/+2
| * | [S390] Program check in diag 210 under 31 bitMichael Holzheu2007-07-101-15/+7
| * | [S390] Bogomips calculation for 64 bit.Martin Schwidefsky2007-07-103-5/+16
| * | [S390] smp: Merge smp_count_cpus() and smp_get_save_areas().Heiko Carstens2007-07-101-42/+21
| * | [S390] zcore: Fix __user annotation.Heiko Carstens2007-07-101-1/+1
| * | [S390] fixed cdl-format detection.Stefan Haberland2007-07-101-70/+97
| * | [S390] sclp: Test facility list before executing a service call.Heiko Carstens2007-07-105-0/+20
| * | [S390] sclp: introduce some new interfaces.Heiko Carstens2007-07-105-101/+121
| * | [S390] Fixed comment typo.Ralph Wuerthner2007-07-101-1/+1
| * | [S390] vmcp cleanupRobert P. J. Day2007-07-101-7/+6
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmwLinus Torvalds2007-07-1062-1107/+2249
|\ \ \
| * | | [GFS2] Accept old format NFS filehandlesSteven Whitehouse2007-07-101-0/+2
| * | | [GFS2] Small fixes to logging codeSteven Whitehouse2007-07-091-5/+14
| * | | [DLM] dump more lock valuesDavid Teigland2007-07-092-41/+43
| * | | [GFS2] Remove i_mode passing from NFS File HandleWendy Cheng2007-07-094-41/+54
| * | | [GFS2] Obtaining no_formal_ino from directory entryWendy Cheng2007-07-096-13/+24
| * | | [GFS2] git-gfs2-nmw-build-fixakpm@linux-foundation.org2007-07-091-1/+1
| * | | [GFS2] System won't suspend with GFS2 file system mountedAbhijith Das2007-07-091-0/+11
| * | | [GFS2] remounting w/o acl option leaves acls enabledBob Peterson2007-07-091-13/+12
| * | | [GFS2] inode size inconsistencyWendy Cheng2007-07-091-2/+2
| * | | [DLM] Telnet to port 21064 can stop all lockspacesPatrick Caulfield2007-07-091-4/+10
| * | | [GFS2] Fix gfs2_block_truncate_page err returnS. Wendy Cheng2007-07-091-0/+1
| * | | [GFS2] Addendum to the journaled file/unmount patchRobert Peterson2007-07-091-2/+4
| * | | [GFS2] Simplify multiple glock aquisitionSteven Whitehouse2007-07-091-51/+13
| * | | [GFS2] assertion failure after writing to journaled file, umountRobert Peterson2007-07-095-56/+132
| * | | [GFS2] Use zero_user_page() in stuffed_readpage()Steven Whitehouse2007-07-091-5/+1
| * | | [GFS2] Remove bogus '\0' in rgrp.cSteven Whitehouse2007-07-091-1/+0
| * | | [GFS2] Journaled file write/unstuff bugRobert Peterson2007-07-093-3/+42
| * | | [DLM] don't require FS flag on all nodesDavid Teigland2007-07-091-3/+4
| * | | [GFS2] Fix deallocation issuesAbhijith Das2007-07-094-14/+48
| * | | [GFS2] return conflicts for GETLKDavid Teigland2007-07-091-1/+5
| * | | [GFS2] set plock owner in GETLK infoDavid Teigland2007-07-091-1/+1
| * | | [GFS2] gfs2_lookupi() uninitialised var fixakpm@linux-foundation.org2007-07-091-1/+1
| * | | [GFS2] Recovery for lost unlinked inodesSteven Whitehouse2007-07-093-32/+107
| * | | [GFS2] Can't mount GFS2 file system on AoE deviceRobert Peterson2007-07-091-0/+3