aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
*-. Merge branches 'x86-reboot-for-linus' and 'x86-setup-for-linus' of git://git....Linus Torvalds2011-05-191-11/+11
|\ \
| | * x86, setup: Fix EDD3.0 data verification.Gleb Natapov2011-04-271-11/+11
* | | Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2011-05-191-22/+10
|\ \ \
| * \ \ Merge branch 'x86/urgent' into x86-mmTejun Heo2011-05-021654-7102/+5998
| |\ \ \
| * \ \ \ Merge branch 'x86/numa' into x86-mmTejun Heo2011-05-0256-326/+532
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'x86-mm' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/mis...Ingo Molnar2011-04-041-22/+10
| |\ \ \ \
| | * | | | acpi throttling: Use this_cpu_has and simplify code current cpuChristoph Lameter2011-03-291-22/+10
* | | | | | Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2011-05-191-2/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
* | | | | | Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2011-05-192-19/+11
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'linus' into timers/coreThomas Gleixner2011-05-0262-211/+511
| |\ \ \ \ \ \
| * | | | | | | RTC: Disable CONFIG_RTC_CLASS from being built as a moduleJohn Stultz2011-05-021-5/+2
| * | | | | | | time: Add timekeeping_inject_sleeptimeJohn Stultz2011-04-261-14/+9
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/l...Linus Torvalds2011-05-196-13/+97
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-a...Thomas Gleixner2011-05-144625-181720/+370652
| |\ \ \ \ \ \ \
| | * | | | | | | clocksource: add common i8253 PIT clocksourceRussell King2011-05-144-0/+94
| * | | | | | | | ia64: convert to clocksource_register_hz/khzJohn Stultz2011-02-211-5/+1
| * | | | | | | | x86: Convert remaining x86 clocksources to clocksource_register_hz/khzJohn Stultz2011-02-211-8/+2
* | | | | | | | | Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-05-193-37/+2
|\ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ Merge branches 'dma-debug/next', 'amd-iommu/command-cleanups', 'amd-iommu/ats...Joerg Roedel2011-05-103-37/+2
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | | * | | | | | | | PCI: Move ATS declarations in seperate header fileJoerg Roedel2011-04-113-37/+2
| | |/ / / / / / / /
* | | | | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/raf...Linus Torvalds2011-05-1914-399/+559
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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
| | * | | | | | | | | | PM / Platform: Use generic runtime PM callbacks directlyRafael J. Wysocki2011-04-291-28/+3
| | * | | | | | | | | | PM: Export platform bus type's default PM callbacksRafael J. Wysocki2011-04-291-54/+18
| | * | | | | | | | | | PM: Make power domain callbacks take precedence over subsystem onesRafael J. Wysocki2011-04-292-52/+41
| * | | | | | | | | | | Merge branch 'syscore' into for-linusRafael J. Wysocki2011-05-174-216/+3
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | PM: Remove sysdev suspend, resume and shutdown operationsRafael J. Wysocki2011-05-114-216/+3
| * | | | | | | | | | | | PM / Wakeup: Remove useless synchronize_rcu() callEric Dumazet2011-05-171-1/+0
| * | | | | | | | | | | | PM / Wakeup: Fix build warning related to the "wakeup" sysfs fileRafael J. Wysocki2011-05-171-2/+2
| * | | | | | | | | | | | PM: Print a warning if firmware is requested when tasks are frozenRafael J. Wysocki2011-05-171-0/+5
| * | | | | | | | | | | | PM / Runtime: Rework runtime PM handling during driver removalRafael J. Wysocki2011-05-171-3/+3
* | | | | | | | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-05-1913-189/+264
|\ \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'cma', 'cxgb4' and 'qib' into for-nextRoland Dreier2011-05-128-111/+108
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | IB/qib: Use pci_dev->revisionSergei Shtylyov2011-05-121-4/+1
| | | * | | | | | | | | | | | | IB/ipath: Use pci_dev->revision, againSergei Shtylyov2011-05-091-8/+1
| | | * | | | | | | | | | | | | IB/qib: Prevent driver hang with unprogrammed boardsMitko Haralanov2011-05-091-1/+2
| | | | |_|_|/ / / / / / / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | RDMA/cxgb4: EEH errors can hang the driverSteve Wise2011-05-093-53/+66
| | * | | | | | | | | | | | | RDMA/cxgb4: Reset wait condition atomicallySteve Wise2011-05-092-30/+26
| | * | | | | | | | | | | | | RDMA/cxgb4: Fix missing parenthesesRoel Kluin2011-05-091-1/+1
| | * | | | | | | | | | | | | RDMA/cxgb4: Initialization errors can cause crashSteve Wise2011-05-091-3/+3
| | * | | | | | | | | | | | | RDMA/cxgb4: Don't change QP state outside EP lockSteve Wise2011-05-093-12/+9
| | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | RDMA/iwcm: Get rid of enum iw_cm_event_statusRoland Dreier2011-05-093-10/+10
| * | | | | | | | | | | | | RDMA/cma: Add an ID_REUSEADDR optionHefty, Sean2011-05-092-67/+130
| * | | | | | | | | | | | | RDMA/cma: Fix handling of IPv6 addressing in cma_use_portHefty, Sean2011-05-091-7/+22
| |/ / / / / / / / / / / /