aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'android-3.0' into android-omap-3.0Todd Poynor2013-03-131-2/+2
|\
| * Merge tag 'v3.0.68' into android-3.0Colin Cross2013-03-131-2/+2
| |\
| | * Driver core: treat unregistered bus_types as having no devicesBjorn Helgaas2013-02-281-2/+2
* | | Merge branch 'android-3.0' into android-omap-3.0Todd Poynor2013-01-162-20/+43
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'stable/linux-3.0.y' into android-3.0Todd Poynor2012-11-012-20/+43
| |\ \ | | |/
| | * PM / Runtime: Clear power.deferred_resume on success in rpm_suspend()Rafael J. Wysocki2012-10-021-1/+1
| | * PM / Runtime: Fix rpm_resume() return value for power.no_callbacks setRafael J. Wysocki2012-10-021-1/+2
| | * mm: memory hotplug: Check if pages are correctly reserved on a per-section basisMel Gorman2012-08-011-18/+40
| * | Merge linux-stable 3.0.28 into android-3.0Todd Poynor2012-04-194-15/+36
| |\ \ | | |/
* | | Merge linux-omap-3.0 into android-omap-3.0Todd Poynor2012-04-194-15/+36
|\ \ \
| * \ \ Merge linux-stable 3.0.28 into linux-omap-3.0Todd Poynor2012-04-194-15/+36
| |\ \ \ | | | |/ | | |/|
| | * | PM / Driver core: leave runtime PM enabled during system shutdownAlan Stern2012-03-191-2/+4
| | * | firmware: Fix an oops on reading fw_priv->fw in sysfs loading fileNeil Horman2012-01-121-7/+7
| | * | drivers/base/node.c: fix compilation error with older versions of gccClaudio Scordino2011-11-261-6/+8
| | * | PM / driver core: disable device's runtime PM during shutdownPeter Chen2011-11-261-0/+3
| | * | PM / Runtime: Automatically retry failed autosuspendsAlan Stern2011-11-111-2/+16
* | | | Merge branch 'android-3.0' into android-omap-3.0Erik Gilling2012-04-184-0/+1086
|\ \ \ \ | | |_|/ | |/| |
| * | | sync: add poll supportErik Gilling2012-04-181-0/+17
| * | | sw_sync: add fill_driver_data supportErik Gilling2012-04-181-0/+14
| * | | sync: add ioctl to get fence dataErik Gilling2012-04-181-0/+82
| * | | sw_sync: add debug supportErik Gilling2012-04-181-0/+19
| * | | sync: add debugfs supportErik Gilling2012-04-181-2/+174
| * | | sync: add timestamps to sync_ptsErik Gilling2012-04-181-0/+5
| * | | sw_sync: add cpu based sync driverErik Gilling2012-04-183-0/+242
| * | | sync: Add synchronization frameworkErik Gilling2012-04-183-0/+535
| * | | Merge commit 'v3.0.8' into android-3.0Colin Cross2011-10-271-5/+6
| |\ \ \ | | | |/ | | |/|
* | | | Merge branch 'linux-omap-3.0' into android-omap-3.0Colin Cross2011-10-271-5/+6
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge commit 'v3.0.8' into linux-omap-3.0Colin Cross2011-10-271-5/+6
| |\ \ \ | | | |/ | | |/|
| | * | firmware loader: allow builtin firmware load even if usermodehelper is disabledLinus Torvalds2011-10-031-5/+6
| * | | Merge commit 'v3.0' into linux-omap-3.0Colin Cross2011-08-101-1/+0
| |\ \ \ | | |/ /
| * | | Merge commit 'v3.0-rc7' into linux-omap-3.0Colin Cross2011-07-121-0/+8
| |\ \ \
| * \ \ \ Merge commit 'v3.0-rc6' into linux-omap-3.0Colin Cross2011-07-111-1/+1
| |\ \ \ \
| * \ \ \ \ Merge commit 'v3.0-rc5' into linux-omap-3.0Colin Cross2011-06-292-9/+23
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'android-3.0' into android-omap-3.0Colin Cross2011-09-231-0/+9
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | PM: runtime: add might_sleep to PM runtime functionsColin Cross2011-09-231-0/+9
* | | | | | | 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