aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'android-3.0' into android-omap-3.0Todd Poynor2013-03-131-2/+32
|\
| * Merge tag 'v3.0.68' into android-3.0Colin Cross2013-03-131-2/+32
| |\
| | * SGI-XP: handle non-fatal trapsRobin Holt2013-01-271-2/+32
* | | Merge branch 'android-3.0' into android-omap-3.0Todd Poynor2013-01-161-19/+65
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'stable/linux-3.0.y' into android-3.0Todd Poynor2012-11-011-19/+65
| |\ \ | | |/
| | * drivers/misc/sgi-xp/xpc_uv.c: SGI XPC fails to load when cpu 0 is out of IRQ ...Robin Holt2012-10-021-19/+65
* | | Merge branch 'android-3.0' into android-omap-3.0Todd Poynor2012-04-301-19/+43
|\ \ \ | |/ /
| * | Merge commit 'v3.0.30' into android-3.0Todd Poynor2012-04-301-19/+43
| |\ \ | | |/
| | * pch_phub: Improve ADE(Address Decode Enable) controlTomoya MORINAGA2012-04-221-17/+34
| | * pch_phub: Care FUNCSEL register in PMTomoya MORINAGA2012-04-221-0/+7
| | * pch_phub: Fix register miss-setting issueTomoya MORINAGA2012-04-221-2/+2
| * | Merge linux-stable 3.0.28 into android-3.0Todd Poynor2012-04-196-55/+147
| |\ \ | | |/
* | | Merge linux-omap-3.0 into android-omap-3.0Todd Poynor2012-04-196-55/+147
|\ \ \
| * \ \ Merge linux-stable 3.0.28 into linux-omap-3.0Todd Poynor2012-04-196-55/+147
| |\ \ \ | | | |/ | | |/|
| | * | x86,kgdb: Fix DEBUG_RODATA limitation using text_poke()Jason Wessel2012-04-131-17/+0
| | * | kgdbts: (2 of 2) fix single step awareness to work correctly with SMPJason Wessel2012-04-131-11/+62
| | * | kgdbts: (1 of 2) fix single step awareness to work correctly with SMPJason Wessel2012-04-131-11/+43
| | * | kgdbts: Fix kernel oops with CONFIG_DEBUG_RODATAJason Wessel2012-04-131-24/+28
| | * | cs5535-mfgpt: don't call __init function from __devinitDanny Kukawka2012-03-121-1/+1
| | * | mmc: cb710 core: Add missing spin_lock_init for irq_lock of struct cb710_chipAxel Lin2012-02-131-0/+1
| | * | pcie-gadget-spear: Add "platform:" prefix for platform modaliasAxel Lin2011-11-261-1/+1
| | * | pch_phub: Fix MAC address writing issue for LAPIS ML7831Tomoya MORINAGA2011-11-261-1/+1
| | * | pch_phub: Support new device LAPIS Semiconductor ML7831 IOHTomoya MORINAGA2011-11-262-7/+28
* | | | Merge branch 'android-3.0' into android-omap-3.0Dmitry Shmidt2012-02-063-1350/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | misc: remove android pmem driver, it's obsolete.Dima Zavin2012-01-233-1350/+0
* | | | Merge branch 'linux-omap-3.0' into android-omap-3.0Todd Poynor2011-11-301-5/+6
|\ \ \ \ | | |/ / | |/| |
| * | | OMAP4: temp_sensor: provide sensible and traceable warningsNishanth Menon2011-11-301-5/+6
* | | | Merge branch 'android-3.0' into android-omap-3.0Colin Cross2011-11-143-97/+0
|\ \ \ \ | | |/ / | |/| |
| * | | misc: remove kernel debugger coreDima Zavin2011-11-143-97/+0
| * | | Merge commit 'v3.0.8' into android-3.0Colin Cross2011-10-271-6/+8
| |\ \ \ | | | |/ | | |/|
* | | | Merge branch 'linux-omap-3.0' into android-omap-3.0Erik Gilling2011-11-071-2/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | OMAP4: temp_sensor: update throttling thresholdsPaul Eastham2011-11-041-2/+2
* | | | Merge branch 'linux-omap-3.0' into android-omap-3.0Colin Cross2011-10-271-6/+8
|\ \ \ \ | |/ / /
| * | | Merge commit 'v3.0.8' into linux-omap-3.0Colin Cross2011-10-271-6/+8
| |\ \ \ | | | |/ | | |/|
| | * | lis3: fix regression of HP DriveGuard with 8bit chipTakashi Iwai2011-10-161-6/+8
* | | | Merge branch 'linux-omap-3.0' into android-omap-3.0Iliyan Malchev2011-10-151-6/+0
|\ \ \ \ | |/ / /
| * | | OMAP4: temp_sensor: remove save_ctx use-countingNishanth Menon2011-10-141-6/+0
* | | | Merge branch 'linux-omap-3.0' into android-omap-3.0Erik Gilling2011-10-101-1/+1
|\ \ \ \ | |/ / /
| * | | OMAP4: temp_sensor: Update T_SHUT temperature value to 110CGirish S Ghongdemath2011-10-091-1/+1
* | | | Merge branch 'linux-omap-3.0' into android-omap-3.0Iliyan Malchev2011-09-261-1/+2
|\ \ \ \ | |/ / /
| * | | misc: omap_temp_sensor: print temp readings when exceeding thresholdYu Yuan2011-09-261-1/+2
* | | | Merge branch 'linux-omap-3.0' into android-omap-3.0Dima Zavin2011-09-111-22/+19
|\ \ \ \ | |/ / /
| * | | OMAP4: misc: omap_temp_sensor: set drvdata before calling sensor_enableGirish S Ghongdemath2011-09-111-2/+2
| * | | Revert "misc: omap_temp_sensor: Fix wrong structure pointer."Girish S Ghongdemath2011-09-111-20/+17
* | | | Merge branch 'linux-omap-3.0' into android-omap-3.0Erik Gilling2011-09-081-2/+43
|\ \ \ \ | |/ / /
| * | | OMAP4: TEMP: Sensor: Update logic to throttle/unthrottleGirish S Ghongdemath2011-09-071-0/+41
| * | | OMAP4: TEMP: sensor update T_hot/T_cold to take into account OMAP hot spotGirish S Ghongdemath2011-09-071-2/+2
* | | | Merge branch 'linux-omap-3.0' into android-omap-3.0Iliyan Malchev2011-09-061-31/+29
|\ \ \ \ | |/ / /
| * | | misc: omap_temp_sensor: Fix wrong structure pointer.Axel Haslam2011-09-061-17/+20
| * | | OMAP: PM: replace omap_pm_get_dev_context_loss_count with omap_pm_was_context...Axel Haslam2011-09-061-14/+9