summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2012-05-2431-225/+155
|\
| * Merge branch 'fortglx/3.5/time' of git://git.linaro.org/people/jstultz/linux ...Thomas Gleixner2012-05-223-9/+4
| |\
| | * timekeeping: Fix a few minor newline issues.Richard Cochran2012-05-211-3/+1
| | * time: remove obsolete declarationRichard Cochran2012-05-211-1/+0
| | * ntp: Fix a stale comment and a few stray newlines.Richard Cochran2012-05-211-4/+2
| | * ntp: Correct TAI offset during leap secondRichard Cochran2012-05-211-1/+1
| * | timers: Fixup the Kconfig consolidation falloutThomas Gleixner2012-05-2122-68/+42
| |/
| * x86: Use generic time configThomas Gleixner2012-05-211-24/+7
| * unicore32: Use generic time configAnna-Maria Gleixner2012-05-211-3/+0
| * um: Use generic time configAnna-Maria Gleixner2012-05-211-4/+1
| * tile: Use generic time configAnna-Maria Gleixner2012-05-211-3/+1
| * sparc: Use: generic time configAnna-Maria Gleixner2012-05-211-12/+3
| * sh: Use generic time configAnna-Maria Gleixner2012-05-211-10/+2
| * score: Use generic time configAnna-Maria Gleixner2012-05-211-3/+1
| * s390: Use generic time configAnna-Maria Gleixner2012-05-211-9/+3
| * openrisc: Use generic time configAnna-Maria Gleixner2012-05-211-3/+1
| * powerpc: Use generic time configAnna-Maria Gleixner2012-05-211-9/+3
| * mn10300: Use generic time configAnna-Maria Gleixner2012-05-211-6/+1
| * mips: Use generic time configAnna-Maria Gleixner2012-05-211-11/+2
| * microblaze: Use generic time configAnna-Maria Gleixner2012-05-211-6/+1
| * m68k: Use generic time configAnna-Maria Gleixner2012-05-211-6/+1
| * m32r: Use generic time configAnna-Maria Gleixner2012-05-211-3/+1
| * ia64: Use generic time configAnna-Maria Gleixner2012-05-211-7/+2
| * hexagon: Use generic time configAnna-Maria Gleixner2012-05-211-12/+3
| * cris: Use generic time configAnna-Maria Gleixner2012-05-211-6/+1
| * c6x: Use generic time configAnna-Maria Gleixner2012-05-211-6/+1
| * blackfin: Use generic time configAnna-Maria Gleixner2012-05-211-5/+3
| * avr32: Use generic time configAnna-Maria Gleixner2012-05-211-3/+1
| * arm: Use generic time configAnna-Maria Gleixner2012-05-211-16/+2
| * alpha: Use generic time configAnna-Maria Gleixner2012-05-211-3/+1
| * timers: Provide generic Kconfig switchesThomas Gleixner2012-05-211-0/+35
| * x86: Allow multiple values to be specified with "hpet="Jan Beulich2012-05-071-1/+6
| * x86: Clear HPET configuration registers on startupJan Beulich2012-05-071-8/+51
* | Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-05-2413-189/+218
|\ \
| * | firewire: sbp2: document the absence of alignment requirementsClemens Ladisch2012-05-211-4/+6
| * | firewire: sbp2: remove superfluous blk_queue_max_segment_size() callClemens Ladisch2012-05-211-2/+0
| * | firewire: sbp2: use scsi_dma_(un)mapClemens Ladisch2012-05-211-9/+4
| * | firewire: sbp2: give correct DMA device to scsi frameworkClemens Ladisch2012-05-211-1/+2
| * | Merge tag 'v3.4' with SCSI updates, needed for subsequent firewire-sbp2 changesStefan Richter2012-05-211176-7920/+11719
| |\ \
| * | | firewire: core: fw_device_refresh(): clean up error handlingClemens Ladisch2012-04-171-21/+12
| * | | firewire: core: log config rom reading errorsClemens Ladisch2012-04-171-15/+27
| * | | firewire: core: log error in case of failed bus manager lockClemens Ladisch2012-04-171-2/+2
| * | | firewire: move rcode_string() to coreClemens Ladisch2012-04-175-29/+29
| * | | firewire: core: improve reread_config_rom() interfaceClemens Ladisch2012-04-171-21/+19
| * | | firewire: core: wait for inaccessible devices after bus resetClemens Ladisch2012-04-171-6/+3
| * | | firewire: ohci: omit spinlock IRQ flags where possibleStefan Richter2012-04-171-13/+10
| * | | firewire: ohci: correct signedness of a local variableStefan Richter2012-04-171-2/+2
| * | | firewire: core: fix DMA mapping directionStefan Richter2012-04-174-39/+100
| * | | firewire: use module_pci_driverAxel Lin2012-04-092-29/+6
* | | | Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds2012-05-24323-14777/+41792
|\ \ \ \
OpenPOWER on IntegriCloud