Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'android-3.0' into android-omap-3.0 | Todd Poynor | 2013-03-13 | 1 | -2/+2 |
|\ | |||||
| * | Merge tag 'v3.0.68' into android-3.0 | Colin Cross | 2013-03-13 | 1 | -2/+2 |
| |\ | |||||
| | * | Driver core: treat unregistered bus_types as having no devices | Bjorn Helgaas | 2013-02-28 | 1 | -2/+2 |
* | | | Merge branch 'android-3.0' into android-omap-3.0 | Todd Poynor | 2013-01-16 | 2 | -20/+43 |
|\ \ \ | |/ / | |||||
| * | | Merge remote-tracking branch 'stable/linux-3.0.y' into android-3.0 | Todd Poynor | 2012-11-01 | 2 | -20/+43 |
| |\ \ | | |/ | |||||
| | * | PM / Runtime: Clear power.deferred_resume on success in rpm_suspend() | Rafael J. Wysocki | 2012-10-02 | 1 | -1/+1 |
| | * | PM / Runtime: Fix rpm_resume() return value for power.no_callbacks set | Rafael J. Wysocki | 2012-10-02 | 1 | -1/+2 |
| | * | mm: memory hotplug: Check if pages are correctly reserved on a per-section basis | Mel Gorman | 2012-08-01 | 1 | -18/+40 |
| * | | Merge linux-stable 3.0.28 into android-3.0 | Todd Poynor | 2012-04-19 | 4 | -15/+36 |
| |\ \ | | |/ | |||||
* | | | Merge linux-omap-3.0 into android-omap-3.0 | Todd Poynor | 2012-04-19 | 4 | -15/+36 |
|\ \ \ | |||||
| * \ \ | Merge linux-stable 3.0.28 into linux-omap-3.0 | Todd Poynor | 2012-04-19 | 4 | -15/+36 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | PM / Driver core: leave runtime PM enabled during system shutdown | Alan Stern | 2012-03-19 | 1 | -2/+4 |
| | * | | firmware: Fix an oops on reading fw_priv->fw in sysfs loading file | Neil Horman | 2012-01-12 | 1 | -7/+7 |
| | * | | drivers/base/node.c: fix compilation error with older versions of gcc | Claudio Scordino | 2011-11-26 | 1 | -6/+8 |
| | * | | PM / driver core: disable device's runtime PM during shutdown | Peter Chen | 2011-11-26 | 1 | -0/+3 |
| | * | | PM / Runtime: Automatically retry failed autosuspends | Alan Stern | 2011-11-11 | 1 | -2/+16 |
* | | | | Merge branch 'android-3.0' into android-omap-3.0 | Erik Gilling | 2012-04-18 | 4 | -0/+1086 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | sync: add poll support | Erik Gilling | 2012-04-18 | 1 | -0/+17 |
| * | | | sw_sync: add fill_driver_data support | Erik Gilling | 2012-04-18 | 1 | -0/+14 |
| * | | | sync: add ioctl to get fence data | Erik Gilling | 2012-04-18 | 1 | -0/+82 |
| * | | | sw_sync: add debug support | Erik Gilling | 2012-04-18 | 1 | -0/+19 |
| * | | | sync: add debugfs support | Erik Gilling | 2012-04-18 | 1 | -2/+174 |
| * | | | sync: add timestamps to sync_pts | Erik Gilling | 2012-04-18 | 1 | -0/+5 |
| * | | | sw_sync: add cpu based sync driver | Erik Gilling | 2012-04-18 | 3 | -0/+242 |
| * | | | sync: Add synchronization framework | Erik Gilling | 2012-04-18 | 3 | -0/+535 |
| * | | | Merge commit 'v3.0.8' into android-3.0 | Colin Cross | 2011-10-27 | 1 | -5/+6 |
| |\ \ \ | | | |/ | | |/| | |||||
* | | | | Merge branch 'linux-omap-3.0' into android-omap-3.0 | Colin Cross | 2011-10-27 | 1 | -5/+6 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge commit 'v3.0.8' into linux-omap-3.0 | Colin Cross | 2011-10-27 | 1 | -5/+6 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | firmware loader: allow builtin firmware load even if usermodehelper is disabled | Linus Torvalds | 2011-10-03 | 1 | -5/+6 |
| * | | | Merge commit 'v3.0' into linux-omap-3.0 | Colin Cross | 2011-08-10 | 1 | -1/+0 |
| |\ \ \ | | |/ / | |||||
| * | | | Merge commit 'v3.0-rc7' into linux-omap-3.0 | Colin Cross | 2011-07-12 | 1 | -0/+8 |
| |\ \ \ | |||||
| * \ \ \ | Merge commit 'v3.0-rc6' into linux-omap-3.0 | Colin Cross | 2011-07-11 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge commit 'v3.0-rc5' into linux-omap-3.0 | Colin Cross | 2011-06-29 | 2 | -9/+23 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'android-3.0' into android-omap-3.0 | Colin Cross | 2011-09-23 | 1 | -0/+9 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | PM: runtime: add might_sleep to PM runtime functions | Colin Cross | 2011-09-23 | 1 | -0/+9 |
* | | | | | | | Merge branch 'android-3.0' into android-omap-3.0 | Colin Cross | 2011-08-10 | 1 | -1/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge commit 'v3.0' into android-3.0 | Colin Cross | 2011-08-10 | 1 | -1/+0 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | mm: Move definition of MIN_MEMORY_BLOCK_SIZE to a header | Benjamin Herrenschmidt | 2011-07-12 | 1 | -1/+0 |
| | | |_|_|/ | | |/| | | | |||||
* | | | | | | Merge branch 'android-3.0' into android-omap-3.0 | Colin Cross | 2011-07-12 | 1 | -0/+8 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge commit 'v3.0-rc7' into android-3.0 | Colin Cross | 2011-07-12 | 1 | -0/+8 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | PM: Reintroduce dropped call to check_wakeup_irqs | Colin Cross | 2011-07-11 | 1 | -0/+8 |
| | | |_|/ | | |/| | | |||||
* | | | | | Merge branch 'android-3.0' into android-omap-3.0 | Dima Zavin | 2011-07-07 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge commit 'v3.0-rc6' into android-3.0 | Dima Zavin | 2011-07-07 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel... | Linus Torvalds | 2011-06-28 | 1 | -1/+1 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | drivers/base/platform.c: don't mark platform_device_register_resndata() as __... | Andrew Morton | 2011-06-07 | 1 | -1/+1 |
* | | | | | Merge branch 'android-3.0' into android-omap-3.0 | Colin Cross | 2011-06-29 | 2 | -11/+24 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge commit 'v3.0-rc5' into android-3.0 | Colin Cross | 2011-06-29 | 2 | -9/+23 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | PM / Runtime: Handle clocks correctly if CONFIG_PM_RUNTIME is unset | Rafael J. Wysocki | 2011-06-21 | 1 | -2/+2 |
| | * | | | PM: Fix async resume following suspend failure | Alan Stern | 2011-06-21 | 1 | -2/+12 |
| | * | | | PM: Rename dev_pm_info.in_suspend to is_prepared | Alan Stern | 2011-06-21 | 1 | -5/+9 |