summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'linus/master' into tracing/kprobesFrederic Weisbecker2009-09-238267-465775/+926774
|\
| * Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/...Linus Torvalds2009-09-233-11/+18
| |\
| | * Add MAINTAINERS entry for ARM/INTEL IXP4xx arch support.Krzysztof HaƂasa2009-09-211-0/+7
| | * ixp4xx: arch_idle() documentation fixupMikael Pettersson2009-09-211-2/+4
| | * ixp4xx: timer and clocks cleanupsMikael Pettersson2009-09-211-9/+7
| * | serial core: fix new kernel-doc warningsRandy Dunlap2009-09-232-4/+4
| * | MN10300: Handle removal of struct uart_infoDavid Howells2009-09-233-9/+9
| * | FRV: Use asm/generic-hardirq.hChristoph Hellwig2009-09-232-17/+4
| * | Merge branch 'x86/ptrace-syscall-exit' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2009-09-231-14/+8
| |\ \
| | * | x86: ptrace: sysret path should reach syscall_trace_leaveRoland McGrath2009-09-231-14/+8
| * | | Merge git://git.infradead.org/battery-2.6Linus Torvalds2009-09-2315-66/+1331
| |\ \ \
| | * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...Anton Vorontsov2009-09-238891-483176/+929995
| | |\| |
| | * | | power_supply: Add driver for the PMU on WM831x PMICsMark Brown2009-09-044-0/+976
| | * | | ds2760_battery: Fix integer overflow for time_to_empty_nowDaniel Mack2009-09-041-3/+3
| | * | | wm97xx_battery: Convert to dev_pm_opsMarek Vasut2009-09-041-7/+10
| | * | | wm97xx_battery: Use irq to detect charger stateMarek Vasut2009-09-041-6/+24
| | * | | wm97xx_battery: Use platform_dataMarek Vasut2009-09-043-19/+49
| | * | | wm97xx-core: Pass platform_data to batteryMarek Vasut2009-09-041-0/+3
| | * | | ds2760_battery: implement set_charged() featureDaniel Mack2009-07-301-0/+52
| | * | | power_supply: get_by_name and set_charged functionalityDaniel Mack2009-07-302-0/+31
| | * | | power_supply: EXPORT_SYMBOL cleanupsDaniel Mack2009-07-301-9/+7
| | * | | ds2760_battery: add current_accum module parameterDaniel Mack2009-07-301-14/+27
| | * | | ds2760_battery: handle full_active_uAh == 0 case correctlyDaniel Mack2009-07-301-2/+7
| | * | | ds2760_battery: add rated_capacity module parameterDaniel Mack2009-07-301-0/+19
| | * | | ds2760_battery: export more featuresDaniel Mack2009-07-301-0/+8
| | * | | ds2760_battery: delay power supply registrationDaniel Mack2009-07-301-6/+6
| | * | | wm8350_power: Implement charge type propertyMark Brown2009-07-141-0/+22
| | * | | power_supply: Add a charge_type property, and use it for olpc driverAndres Salomon2009-07-024-0/+28
| | * | | 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
| * | | | Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airl...Linus Torvalds2009-09-235-123/+102
| |\ \ \ \
| | * | | | drm/radeon/r600: set correct pitch for 4 byte copyAndre Maasikas2009-09-232-2/+2
| | * | | | drm/radeon: consolidate family flags used in pciids.Dave Airlie2009-09-233-121/+100
| * | | | | Merge git://git.infradead.org/mtd-2.6Linus Torvalds2009-09-2364-251/+2795
| |\ \ \ \ \
| | * | | | | mtd: jedec_probe: add PSD4256G6V idMike Frysinger2009-09-231-0/+19
| | * | | | | mtd: OneNand support for Nomadik 8815 SoC (on NHK8815 board)Alessandro Rubini2009-09-201-0/+63
| | * | | | | mtd: nand: driver for Nomadik 8815 SoC (on NHK8815 board)Alessandro Rubini2009-09-207-1/+395
| | * | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...David Woodhouse2009-09-206530-366563/+701870
| | |\ \ \ \ \
| | * | | | | | m25p80: Add Spansion S25FL129P serial flashesKevin Cernekee2009-09-201-1/+3
| | * | | | | | jffs2: Use SLAB_HWCACHE_ALIGN for jffs2_raw_{dirent,inode} slabsDavid Woodhouse2009-09-201-2/+2
| | * | | | | | mtd: sh_flctl: register sh_flctl using platform_driver_probe()David Woodhouse2009-09-201-2/+1
| | * | | | | | mtd: nand: txx9ndfmc: transfer 512 byte at a time if possibleAtsushi Nemoto2009-09-191-5/+47
| | * | | | | | mtd: nand: fix tmio_nand ecc correctionAtsushi Nemoto2009-09-191-1/+16
| | * | | | | | mtd: nand: add __nand_correct_data helper functionAtsushi Nemoto2009-09-192-7/+30
| | * | | | | | mtd: cfi_cmdset_0002: add 0xFF intolerance for M29W128GMassimo Cirillo2009-09-192-11/+4
| | * | | | | | mtd: inftl: fix fold chain block numberMohanlal Jangir2009-09-191-1/+1
| | * | | | | | mtd: jedec: fix compilation problem with I28F640C3B definitionStefan Roese2009-09-191-0/+18
| | * | | | | | mtd: nand: fix ECC Correction bug for SMC ordering for NDFC driverFeng Kan2009-09-191-2/+2
| | * | | | | | mtd: ofpart: Check availability of reg property instead of name propertyBenjamin Krill2009-09-191-11/+10
| | * | | | | | driver/Makefile: Initialize "mtd" and "spi" before "net"Sudhakar Rajashekhara2009-09-191-2/+2