summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2005-11-0738-917/+1896
|\
| * VINO driver version 0.0.5.Ladislav Michl2005-11-075-680/+1545
| * Redefine outs[wl] for ide_outs[wl].Atsushi Nemoto2005-11-071-0/+4
| * Delete duplicate definitions.Ralf Baechle2005-11-071-4/+0
| * Fix return type of setup_frame variantsAtsushi Nemoto2005-11-072-8/+8
| * IRIX: Use schedule_timeout_interruptible.Ralf Baechle2005-11-071-2/+1
| * Define MAX_UDELAY_MSAtsushi Nemoto2005-11-071-0/+9
| * Use rtc_lock to protect RTC operationsAtsushi Nemoto2005-11-0713-4/+111
| * Remove mips_rtc_lockAtsushi Nemoto2005-11-071-7/+0
| * Add .gitignore files for TurbochannelRalf Baechle2005-11-071-0/+1
| * Add .gitignore files for MIPS.Ralf Baechle2005-11-072-0/+5
| * VPE loader janitoringRalf Baechle2005-11-071-56/+44
| * PNX8550 uses a MIPS32-like processor core, not R4xx0.Ralf Baechle2005-11-073-10/+13
| * O2 parport definitionsIlya A. Volynets-Evenbakh2005-11-071-1/+25
| * OSS MIPS drivers: "extern inline" -> "static inline"Adrian Bunk2005-11-072-6/+6
| * Add spaces to MODULE_PROC_FAMILY values.Ralf Baechle2005-11-071-19/+19
| * Turn rtlx upside down.Ralf Baechle2005-11-072-120/+105
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/inputLinus Torvalds2005-11-076-98/+129
|\ \
| * | Input: lkkbd - miscellaneous fixesJan-Benedict Glaw2005-11-021-42/+59
| * | Input: logips2pp - add support for MX3100Mirco Macrelli2005-11-021-0/+3
| * | Input: locomokbd - fix wrong bustypePavel Machek2005-11-021-1/+1
| * | Input: fix input device deregistrationDmitry Torokhov2005-11-021-0/+1
| * | Input: do not register statically allocated devicesDmitry Torokhov2005-11-022-12/+16
| * | Input: locomokbd - convert to dynamic input allocationDmitry Torokhov2005-11-021-32/+31
| * | Input: convert dmasound_awacs (OSS) to dynamic input allocationIan Wienand2005-11-021-12/+19
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6Linus Torvalds2005-11-07192-4890/+11317
|\ \ \
| * | | [MTD] chips: Clean up trailing white spacesThomas Gleixner2005-11-071-1/+1
| * | | [MTD] OneNAND: Clean up trailing white spacesThomas Gleixner2005-11-071-12/+12
| * | | [MTD] NAND: Clean up trailing white spacesThomas Gleixner2005-11-0717-695/+695
| * | | [MTD] devices: Clean up trailing white spacesThomas Gleixner2005-11-0712-156/+156
| * | | [MTD] maps: Clean up trailing white spacesThomas Gleixner2005-11-0761-470/+470
| * | | [MTD] chips: Clean up trailing white spacesThomas Gleixner2005-11-0715-493/+493
| * | | [MTD] user-abi: Clean up trailing white spacesThomas Gleixner2005-11-073-7/+7
| * | | [MTD] includes: Clean up trailing white spacesThomas Gleixner2005-11-0716-118/+118
| * | | [LIB] reed_solomon: Clean up trailing white spacesThomas Gleixner2005-11-075-72/+72
| * | | [JFFS2] Clean up trailing white spacesThomas Gleixner2005-11-0736-605/+604
| * | | [MTD] core: Clean up trailing white spacesThomas Gleixner2005-11-0716-399/+399
| * | | [MTD] chips cfi_cmdset_0002: Prevent timeout raceKonstantin Baidarov2005-11-071-9/+9
| * | | [MTD] maps: Add support for the "TQM834x" BoardsMarian Balakowicz2005-11-073-2/+302
| * | | [MTD] maps ixp2000: fix compile warnings in ixp2000 map driverLennert Buytenhek2005-11-071-3/+3
| * | | [MTD] NAND Kconfig: Simplify dependenciesThomas Gleixner2005-11-071-6/+6
| * | | [MTD] maps/plat-ram: Avoid gcc 4.0 warningThomas Gleixner2005-11-071-2/+2
| * | | [MTD] NAND: nand_write_ecc memory and OOB corruptionTodd Poynor2005-11-071-0/+1
| * | | [MTD] NAND nand_base: Fix shift for bad block check (16bit devices only)Vitaly Wool2005-11-071-1/+1
| * | | [MTD] OneNAND/Kconfig: Fix dependenciesThomas Gleixner2005-11-071-4/+3
| * | | Revert "[PATCH] OneNAND: Add simulator"Thomas Gleixner2005-11-073-474/+0
| * | | [MTD] maps/Kconfig: Simplify and update dependenciesSean Young2005-11-071-29/+32
| * | | [MTD] maps/ts5500: Fix partition support. Code cleanupSean Young2005-11-071-26/+12
| * | | [MTD] Tidy up Tims include cleanupThomas Gleixner2005-11-073-16/+19
| * | | [MTD] maps/ixp4xx: kill some warningsDavid Vrabel2005-11-071-14/+12
OpenPOWER on IntegriCloud