summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* mm: merge populate and nopage into fault (fixes nonlinear)Nick Piggin2007-07-1920-272/+394
* mm: fix fault vs invalidate race for linear mappingsNick Piggin2007-07-1910-116/+127
* Merge branch 'isdn-fix' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzi...Linus Torvalds2007-07-181-3/+1
|\
| * ISDN HiSax: uninitialized return in hisax_cs_setupFlorin Malita2007-07-181-3/+1
* | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/...Linus Torvalds2007-07-1822-56/+1308
|\ \
| * | eHEA: Fix bonding supportThomas Klein2007-07-182-19/+20
| * | Blackfin ethernet driver: on chip ethernet MAC controller driverBryan Wu2007-07-185-0/+1193
| * | fix wrong argument of tc35815_read_plat_dev_addr()Yoichi Yuasa2007-07-181-1/+1
| * | Merge branch 'upstream-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/...Jeff Garzik2007-07-184-18/+15
| |\ \
| | * | [PATCH] zd1211rw: Add ID for Siemens Gigaset USB Stick 54Daniel Drake2007-07-171-0/+1
| | * | [PATCH] zd1211rw: Add ID for Planex GW-US54GXSMasakazu Mokuno2007-07-171-0/+1
| | * | [PATCH] Update version ipw2200 stamp to 1.2.2Zhu Yi2007-07-171-1/+1
| | * | [PATCH] ipw2200: Fix ipw_isr() comments error on shared IRQZhu Yi2007-07-171-1/+1
| | * | [PATCH] Fix ipw2200 set wrong power parameter causing firmware errorZhu Yi2007-07-171-8/+6
| | * | [PATCH] ipw2100: Fix `iwpriv set_power` errorZhu Yi2007-07-171-3/+3
| | * | [PATCH] softmac: Channel is listed twice in scan outputJean Tourrilhes2007-07-171-5/+2
| * | | ARM/ETHER3: Handle multicast frames.YOSHIFUJI Hideaki / 吉藤英明2007-07-181-1/+1
| * | | SAA9730: Handle multicast frames.YOSHIFUJI Hideaki / 吉藤英明2007-07-181-5/+4
| * | | NI5010: Handle multicast frames.YOSHIFUJI Hideaki / 吉藤英明2007-07-181-5/+1
| * | | NS83820: Handle multicast frames.YOSHIFUJI Hideaki / 吉藤英明2007-07-181-1/+1
| * | | Fix RGMII-ID handling in gianfarAndy Fleming2007-07-183-1/+21
| * | | Fix Vitesse RGMII-ID supportAndy Fleming2007-07-181-3/+20
| * | | Add phy-connection-type to gianfar nodesAndy Fleming2007-07-182-0/+10
| * | | Fix Vitesse 824x PHY interrupt ackingAndy Fleming2007-07-181-2/+21
| | |/ | |/|
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6Linus Torvalds2007-07-1838-3156/+3440
|\ \ \
| * \ \ Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6Steve French2007-07-194638-236319/+243495
| |\ \ \ | | |/ /
| * | | [CIFS] merge conflict in fs/cifs/export.cSteve French2007-07-191-0/+1
| * | | [CIFS] Allow disabling CIFS Unix Extensions as mount optionSteve French2007-07-189-46/+65
| * | | [CIFS] More whitespace/formatting fixes (noticed by checkpatch)Steve French2007-07-1710-46/+88
| * | | [CIFS] Typo in previous patchSteve French2007-07-161-2/+1
| * | | [CIFS] zero_user_page() conversionsEric2007-07-161-4/+1
| * | | [CIFS] use simple_prepare_write to zero page dataNate2007-07-161-8/+1
| * | | [CIFS] Fix build break - inet.h not included when experimental ifdef offSteve French2007-07-151-2/+0
| * | | [CIFS] Add support for new POSIX unlinkSteve French2007-07-155-11/+103
| * | | [CIFS] whitespace/formatting fixesSteve French2007-07-1327-1160/+1285
| * | | [CIFS] Fix oops in cifs_create when nfsd server exports cifs mountSteve French2007-07-116-14/+33
| * | | [CIFS] whitespace cleanupSteve French2007-07-1012-591/+610
| * | | [CIFS] Fix packet signatures for NTLMv2 caseSteve French2007-07-098-36/+71
| * | | [CIFS] more whitespace fixesSteve French2007-07-084-137/+141
| * | | [CIFS] more whitespace cleanupSteve French2007-07-077-538/+544
| * | | [CIFS] whitespace cleanupSteve French2007-07-066-46/+48
| * | | [CIFS] whitespace cleanupSteve French2007-07-063-228/+232
| * | | [CIFS] ipv6 support no longer experimentalJeff2007-07-062-62/+1
| * | | [CIFS] Mount should fail if server signing off but client mount option requir...Jeff2007-07-062-1/+3
| * | | [CIFS] whitespace fixesSteve French2007-06-286-106/+108
| * | | [CIFS] Fix sign mount option and sign proc config settingSteve French2007-06-282-95/+29
| * | | [CIFS] whitespace cleanupSteve French2007-06-271-26/+27
| * | | [CIFS] Do not allow signals in cifs_demultiplex_threadJeff2007-06-251-6/+7
| * | | [CIFS] fix whitespaceSteve French2007-06-242-56/+58
| * | | [CIFS] Add in some missing flags and cifs README and TODO correctionsSteve French2007-06-246-29/+80
OpenPOWER on IntegriCloud