aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'android-3.0' into android-omap-3.0Colin Cross2011-08-101-1/+0
|\
| * Merge commit 'v3.0' into android-3.0Colin Cross2011-08-101-1/+0
| |\
| | * mm: Move definition of MIN_MEMORY_BLOCK_SIZE to a headerBenjamin Herrenschmidt2011-07-121-1/+0
* | | Merge branch 'android-3.0' into android-omap-3.0Colin Cross2011-07-121-0/+8
|\ \ \ | |/ /
| * | Merge commit 'v3.0-rc7' into android-3.0Colin Cross2011-07-121-0/+8
| |\ \ | | |/
| | * PM: Reintroduce dropped call to check_wakeup_irqsColin Cross2011-07-111-0/+8
* | | Merge branch 'android-3.0' into android-omap-3.0Dima Zavin2011-07-071-1/+1
|\ \ \ | |/ /
| * | Merge commit 'v3.0-rc6' into android-3.0Dima Zavin2011-07-071-1/+1
| |\ \ | | |/
| | * Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2011-06-281-1/+1
| | |\
| | | * drivers/base/platform.c: don't mark platform_device_register_resndata() as __...Andrew Morton2011-06-071-1/+1
* | | | Merge branch 'android-3.0' into android-omap-3.0Colin Cross2011-06-292-11/+24
|\ \ \ \ | |/ / /
| * | | Merge commit 'v3.0-rc5' into android-3.0Colin Cross2011-06-292-9/+23
| |\ \ \ | | |/ /
| | * | PM / Runtime: Handle clocks correctly if CONFIG_PM_RUNTIME is unsetRafael J. Wysocki2011-06-211-2/+2
| | * | PM: Fix async resume following suspend failureAlan Stern2011-06-211-2/+12
| | * | PM: Rename dev_pm_info.in_suspend to is_preparedAlan Stern2011-06-211-5/+9
| * | | Revert "PM: Prevent waiting forever on asynchronous resume after abort"Colin Cross2011-06-291-2/+1
| * | | Revert "PM: Wait for completion of the parent resume before resuming"Colin Cross2011-06-291-1/+1
* | | | Merge branch 'android-3.0' into android-omap-3.0Colin Cross2011-06-141-1/+48
|\ \ \ \ | |/ / /
| * | | PM: Increase dpm suspend timeoutBenoit Goby2011-06-141-1/+1
| * | | PM: Change dpm watchdog to support async suspendBenoit Goby2011-06-141-30/+20
| * | | PM: Dump suspend thread stack on dpm suspend timeoutBenoit Goby2011-06-141-2/+13
| * | | PM: Wait for completion of the parent resume before resumingBenoit Goby2011-06-141-1/+1
| * | | PM: Prevent waiting forever on asynchronous resume after abortColin Cross2011-06-141-1/+2
| * | | drivers: power: Add watchdog timer to catch drivers which lockup during suspend.San Mehat2011-06-141-0/+45
| |/ /
* | | Merge branch 'linux-omap-pm-3.0' into linux-omap-3.0Colin Cross2011-06-141-0/+17
|\ \ \ | |/ / |/| |
| * | PM: OPP: introduce function to free cpufreq table(v2)Nishanth Menon2011-06-131-0/+17
| |/
* | PM / Runtime: Fix loops in pm_runtime_clk_notify()Rafael J. Wysocki2011-06-071-8/+8
|/
* mm: per-node vmstat: show proper vmstatsKOSAKI Motohiro2011-05-251-5/+9
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-05-231-5/+4
|\
| * Merge branch 'master' into for-nextJiri Kosina2011-04-266-16/+27
| |\
| * | sysfs-memory: fix uninitialized variable warning and clean-up code.Nikanth Karthikesan2011-04-101-5/+4
* | | Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2011-05-194-45/+41
|\ \ \
| * | | drivers/base/memory.c: fix warning due to "memory hotplug: Speed up add/remov...Andrew Morton2011-05-121-1/+1
| * | | memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SEC...Anton Blanchard2011-05-111-16/+8
| * | | drivers:base:fix the coding format of memory.cWanlong Gao2011-04-251-1/+2
| * | | driver core: let dev_set_drvdata return int instead of void as it can failUwe Kleine-König2011-04-221-4/+3
| * | | driver core/platform_device_add_resources: free resource before overwritingUwe Kleine-König2011-04-221-0/+1
| * | | driver core/platform_device_add_resources: set resource to NULL if !resUwe Kleine-König2011-04-221-10/+9
| * | | driver core/platform_device_add_data: free platform data before overwritingUwe Kleine-König2011-04-221-0/+1
| * | | driver core/platform_device_add_data: set platform_data to NULL if !dataUwe Kleine-König2011-04-221-9/+8
| * | | drivers/base/core.c: Fixed brace coding style issue.Karthigan Srinivasan2011-04-221-2/+1
| * | | driver-core: fix race between device_register and driver_registerSebastian Ott2011-04-221-0/+5
| * | | drivers: make device_type constStephen Hemminger2011-04-191-2/+2
* | | | PM: Introduce generic prepare and complete callbacks for subsystemsRafael J. Wysocki2011-05-171-0/+39
* | | | PM: Allow drivers to allocate memory from .prepare() callbacks safelyRafael J. Wysocki2011-05-171-6/+12
* | | | PM: Remove CONFIG_PM_VERBOSERafael J. Wysocki2011-05-171-2/+1
* | | | Merge branch 'power-domains' into for-linusRafael J. Wysocki2011-05-175-169/+494
|\ \ \ \
| * | | | PM: Fix build issue in clock_ops.c for CONFIG_PM_RUNTIME unsetRafael J. Wysocki2011-05-161-0/+1
| * | | | PM: Revert "driver core: platform_bus: allow runtime override of dev_pm_ops"Kevin Hilman2011-05-161-35/+0
| * | | | PM / Runtime: Generic clock manipulation rountines for runtime PM (v6)Rafael J. Wysocki2011-04-302-0/+431