summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-rmk' of git://git.marvell.com/orionRussell King2008-08-0942-52/+575
|\
| * [ARM] Kirkwood: instantiate the orion_spi driver in the platform codeLennert Buytenhek2008-08-093-0/+54
| * [ARM] prevent crashing when too much RAM installedLennert Buytenhek2008-08-093-0/+71
| * [ARM] Kirkwood: Instantiate mv_xor driverSaeed Bishara2008-08-094-0/+220
| * [ARM] Orion: Instantiate mv_xor driver for 5182Saeed Bishara2008-08-099-0/+109
| * [ARM] Orion: enable CONFIG_RTC_DRV_S35390A in the defconfg for QNAP devicesMartin Michlmayr2008-08-091-1/+1
| * [ARM] Orion: enable RTC_DRV_PCF8563 in the defconfig for HP mv2120Martin Michlmayr2008-08-091-1/+1
| * [ARM] Orion: enable KEYBOARD_GPIO in the defconfgMartin Michlmayr2008-08-091-1/+8
| * [ARM] Orion: Export the reset button of the QNAP TS-409Martin Michlmayr2008-08-091-0/+6
| * [ARM] Orion: use better key codes for the TS-209/TS-409 buttonsMartin Michlmayr2008-08-092-3/+3
| * [ARM] Orion: export red SATA lights on TS-409, fix SATA presence/activityMartin Michlmayr2008-08-091-0/+42
| * [ARM] Orion: support D0 5281 siliconLennert Buytenhek2008-08-092-0/+12
| * [ARM] Move include/asm-arm/plat-orion to arch/arm/plat-orion/include/platLennert Buytenhek2008-08-0927-47/+49
* | Merge branch 'for-rmk' of git://aeryn.fluff.org.uk/bjdooks/linuxRussell King2008-08-0911-14/+59
|\ \
| * | [ARM] S3C24XX: Documentation: Update GPIO statusBen Dooks2008-08-092-0/+18
| * | [ARM] S3C24XX: Documentation: update SD/MMC statusBen Dooks2008-08-091-0/+11
| * | [ARM] S3C24XX: Documentation: Update suported CPU listBen Dooks2008-08-091-2/+2
| * | [ARM] S3C24XX: Documentation: update platform docsBen Dooks2008-08-091-0/+17
| * | [ARM] S3C24XX: Fix section mismatch for s3c_lookup_cpuBen Dooks2008-08-091-3/+1
| * | [ARM] CATS: Do not try and map bad PCI IRQ numbersBen Dooks2008-08-091-0/+3
| * | [ARM] JIVE: Remove duplicated mtd includesHuang Weiyi2008-08-091-3/+0
| * | [ARM] S3C24XX: Compilation fix if s3c2410 is not selectedKrzysztof Helt2008-08-091-2/+2
| * | Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm ...Ben Dooks2008-08-0810414-478482/+551271
| |\ \
| * \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...Ben Dooks2008-07-152635-95913/+167869
| |\ \ \
| * | | | [ARM] S3C24XX: Fix SERIAL_SAMSUNG entryArnaud Patard (Rtp2008-07-151-0/+1
| * | | | [ARM] S3C24XX: s3c243xx_clock_register() data can be __initdataBen Dooks2008-07-154-4/+4
* | | | | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/c...Linus Torvalds2008-08-096-54/+89
|\ \ \ \ \
| * | | | | [CPUFREQ][2/2] preregister support for powernow-k8Mark Langsdorf2008-08-082-37/+75
| * | | | | [CPUFREQ][1/2] whitespace fix for powernow-k8Mark Langsdorf2008-08-081-3/+0
| * | | | | [CPUFREQ] Update MAINTAINERS to reflect new mailing list.Dave Jones2008-08-081-1/+1
| * | | | | [CPUFREQ] Fix warning in elanfreqDave Jones2008-08-081-1/+1
| * | | | | [CPUFREQ] Fix -Wshadow warning in conservative governor.Dave Jones2008-08-081-10/+10
| * | | | | [CPUFREQ] Remove EXPERIMENTAL annotation from VIA C7 powersaver kconfig.Dave Jones2008-08-081-2/+2
* | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrenc...Linus Torvalds2008-08-0914-509/+652
|\ \ \ \ \ \
| * | | | | | [CIFS] list entry can not return nullSteve French2008-08-084-74/+61
| * | | | | | turn cifs_setattr into a multiplexor that calls the correct functionJeff Layton2008-08-071-5/+17
| * | | | | | move file time and dos attribute setting logic into new functionJeff Layton2008-08-071-87/+109
| * | | | | | spin off cifs_setattr with unix extensions to its own functionJeff Layton2008-08-071-38/+119
| * | | | | | [CIFS] Code cleanup in old sessionsetup codeSteve French2008-08-062-78/+80
| * | | | | | [CIFS] cifs_mkdir and cifs_create should respect the setgid bit on parent dirJeff Layton2008-08-062-6/+25
| * | | | | | Rename CIFSSMBSetFileTimes to CIFSSMBSetFileInfo and add PID argJeff Layton2008-08-063-14/+13
| * | | | | | change CIFSSMBSetTimes to CIFSSMBSetPathInfoJeff Layton2008-08-063-8/+8
| * | | | | | [CIFS] fix trailing whitespaceSteve French2008-08-061-1/+1
| * | | | | | bundle up Unix SET_PATH_INFO args into a struct and change nameJeff Layton2008-08-066-74/+102
| * | | | | | Fix missing braces in cifs_revalidate()Suresh Jayaraman2008-08-051-1/+2
| * | | | | | remove locking around tcpSesAllocCount atomic variableJeff Layton2008-08-041-9/+6
| * | | | | | [CIFS] properly account for new user= field in SPNEGO upcall string allocationJeff Layton2008-08-011-7/+11
| * | | | | | [CIFS] remove level of indentation from decode_negTokenInitJeff Layton2008-07-312-136/+125
| * | | | | | [CIFS] cifs send2 not retrying enough in some cases on full socketShirish Pargaonkar2008-07-291-0/+1
| * | | | | | [CIFS] oid should also be checked against class in cifs asnSteve French2008-07-291-1/+2