summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* olpc_battery: Add an 'error' sysfs device that displays raw errorsAndres Salomon2009-07-011-0/+32
* Revert "power: remove POWER_SUPPLY_PROP_CAPACITY_LEVEL"Andres Salomon2009-07-014-0/+27
* Add ds2782 battery gas gauge driverRyan Mallon2009-07-013-0/+338
* olpc_battery: Ensure that the TRICKLE bit is checkedAndres Salomon2009-07-011-3/+6
* olpc_battery: Fix up eeprom read functionAndres Salomon2009-07-011-8/+9
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6Linus Torvalds2009-06-309-61/+46
|\
| * ide: memory overrun in ide_get_identity_ioctl() on big endian machines using ...Christian Engelmayer2009-06-301-1/+2
| * ide: fix resume for CONFIG_BLK_DEV_IDEACPI=yBartlomiej Zolnierkiewicz2009-06-303-42/+27
| * ide-cd: handle fragmented packet commands gracefullyBorislav Petkov2009-06-261-2/+12
| * ide: always kill the whole request on errorBartlomiej Zolnierkiewicz2009-06-265-16/+5
| * ide: fix ide_kill_rq() for special ide-{floppy,tape} driver requestsBartlomiej Zolnierkiewicz2009-06-261-1/+1
* | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2009-06-3031-71/+232
|\ \
| * | [ARM] 5562/2: at91: add gpio button support for at91sam9g20ekNicolas Ferre2009-06-291-0/+54
| * | [ARM] 5563/1: at91: at91sam9rlek lcd interface correctionNicolas Ferre2009-06-271-2/+4
| * | [ARM] 5565/2: Use PAGE_SIZE and RO_DATA() in link scriptLinus Walleij2009-06-252-8/+9
| * | [ARM] 5560/1: Avoid buffer overrun in case of an invalid IRQAaro Koskinen2009-06-251-18/+6
| * | Merge branch 's3c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linuxRussell King2009-06-2512-21/+51
| |\ \
| | * | [ARM] GTA02: build fixes (s3c2410_nand_set usage)Nelson Castillo2009-06-241-2/+1
| | * | [ARM] S3C maintainer updates merge branch maintainers-updates into s3c-fixesBen Dooks2009-06-231-0/+43
| | |\ \
| | | * | MAINTAINERS: Add ARM S3C2442, S3C2443, S3C6400, S3C6410 and ARM/SAMSUNGBen Dooks2009-06-131-0/+41
| | | * | MAINTAINERS: Update file list for ARM/S3C2410 and ARM/S3C2440Ben Dooks2009-06-131-0/+2
| | * | | [ARM] MINI2440: Add missing flash_bbt flat to NANDBen Dooks2009-06-231-0/+1
| | * | | [ARM] s3c2410_defconfig: add MINI2440 machine to buildBen Dooks2009-06-231-0/+1
| | * | | [ARM] S3C: Fix S3C24XX build to not include s3c64xx IIS devicesBen Dooks2009-06-231-1/+1
| | * | | [ARM] S3C24XX: Fix missing s3c_iis_device.Ben Dooks2009-06-231-0/+1
| | * | | [ARM] MINI2440: remove duplicated #includeHuang Weiyi2009-06-231-2/+0
| | * | | [ARM] S3C24XX: Fix spi-bus configuration build errorsBen Dooks2009-06-232-4/+2
| | * | | [ARM] S3C: Remove unused CONFIG_DEBUG_S3C_PORTBen Dooks2009-06-234-11/+0
| | * | | [ARM] S3C24XX: Fix use of CONFIG_S3C24XX_PWMBen Dooks2009-06-231-1/+1
| * | | | Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tm...Russell King2009-06-2514-22/+108
| |\ \ \ \
| | * | | | OMAP: Fix IOMEM macro for assemblyTony Lindgren2009-06-231-1/+1
| | * | | | OMAP2/3: Initialize gpio debounce registerjanboe2009-06-231-0/+1
| | * | | | OMAP: IOMMU: function flush_iotlb_page is not flushing correct entryFernando Guzman Lugo2009-06-231-1/+1
| | * | | | OMAP3: RX51: Use OneNAND sync read / writeAdrian Hunter2009-06-231-0/+1
| | * | | | OMAP2/3: gpmc-onenand: correct use of async timingsAdrian Hunter2009-06-231-2/+19
| | * | | | OMAP3: DMA: Enable idlemodes for DMA OCPKalle Jokiniemi2009-06-232-0/+28
| | * | | | OMAP3: SRAM size fix for HS/EMU devicesTero Kristo2009-06-231-1/+6
| | * | | | OMAP2/3: Add omap_type() for determining GP/EMU/HSKevin Hilman2009-06-232-11/+33
| | * | | | OMAP2/3: omap mailbox: platform_get_irq() error ignoredRoel Kluin2009-06-231-3/+3
| | * | | | OMAP2/3: mmc-twl4030: use correct controller in twl_mmc23_set_powerGrazvydas Ignotas2009-06-231-1/+12
| | * | | | OMAP1: remove duplicated #includeHuang Weiyi2009-06-231-1/+0
| | * | | | OMAP1: Fix N770 MMC supportAndrew de Quincey2009-06-231-0/+2
| | * | | | OMAP1: Fix compilation of arch/arm/mach-omap1/mailbox.cJonathan McDowell2009-06-231-1/+1
| | |/ / /
* | | | | Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notifyLinus Torvalds2009-06-291-1/+1
|\ \ \ \ \
| * | | | | fs: allow d_instantiate to be called with negative parent dentryJeremy Kerr2009-06-291-1/+1
* | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw...Linus Torvalds2009-06-2934-196/+233
|\ \ \ \ \ \
| * | | | | | sound: OSS: mpu401, fix deadlockJiri Slaby2009-06-291-13/+3
| * | | | | | Merge branch 'fix/pci-vdevice' into for-linusTakashi Iwai2009-06-2926-102/+92
| |\ \ \ \ \ \
| | * | | | | | sound: Use PCI_VDEVICE for CREATIVE and ECTIVAJoe Perches2009-06-254-6/+6
| | * | | | | | sound: Use PCI_VDEVICEJoe Perches2009-06-2523-96/+86
| | | |/ / / / | | |/| | | |