aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/l...Linus Torvalds2010-08-0646-262/+165
|\
| * um: Fix read_persistent_clock falloutThomas Gleixner2010-08-031-3/+2
| * kgdb: Do not access xtime directlyThomas Gleixner2010-07-291-1/+3
| * Merge branch 'powerpc.cherry-picks' into timers/clocksourceThomas Gleixner2010-07-2811-363/+80
| |\
| | * powerpc: Clean up obsolete code relating to decrementer and timebasePaul Mackerras2010-07-287-153/+9
| | * powerpc: Rework VDSO gettimeofday to prevent time going backwardsPaul Mackerras2010-07-285-237/+99
| * | clocksource: Add __clocksource_updatefreq_hz/khz methodsJohn Stultz2010-07-272-5/+35
| * | x86: Convert common clocksources to use clocksource_register_hz/khzJohn Stultz2010-07-273-15/+12
| * | timekeeping: Make xtime and wall_to_monotonic staticJohn Stultz2010-07-273-14/+2
| * | hrtimer: Cleanup direct access to wall_to_monotonicJohn Stultz2010-07-273-6/+11
| * | um: Convert to use read_persistent_clockJohn Stultz2010-07-271-6/+7
| * | timkeeping: Fix update_vsyscall to provide wall_to_monotonic offsetJohn Stultz2010-07-276-19/+25
| * | powerpc: Cleanup xtime usageJohn Stultz2010-07-271-4/+4
| * | powerpc: Simplify update_vsyscallJohn Stultz2010-07-271-30/+25
| * | time: Kill off CONFIG_GENERIC_TIMEJohn Stultz2010-07-2733-159/+19
| * | time: Implement timespec_addJohn Stultz2010-07-272-3/+19
| * | x86: Fix vtime/file timestamp inconsistenciesJohn Stultz2010-07-271-3/+8
| |/
* | Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2010-08-065-12/+141
|\ \
| * | Documentation: Add timers/timers-howto.txtPatrick Pannuto2010-08-041-0/+105
| * | timer: Added usleep_range timerPatrick Pannuto2010-08-042-0/+23
| * | Revert "timer: Added usleep[_range] timer"Thomas Gleixner2010-08-042-28/+0
| * | clockevents: Remove the per cpu tick skewArjan van de Ven2010-08-021-5/+0
| * | posix_timer: Move copy_to_user(created_timer_id) down in timer_create()Andrey Vagin2010-07-231-5/+6
| * | timer: Added usleep[_range] timerPatrick Pannuto2010-07-232-0/+28
| * | timers: Document meaning of deferrable timerJ. Bruce Fields2010-07-231-2/+7
* | | x86, kvm: Remove cast obsoleted by set_64bit() prototype cleanupH. Peter Anvin2010-08-061-5/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2010-08-0697-3195/+1197
|\ \ \
| * | | pcmcia: avoid buffer overflow in pcmcia_setup_isa_irqDominik Brodowski2010-08-031-1/+4
| * | | pcmcia: do not request windows if you don't need toDominik Brodowski2010-08-035-140/+5
| * | | pcmcia: insert PCMCIA device resources into resource treeDominik Brodowski2010-08-036-34/+60
| * | | pcmcia: export resource information to sysfsDominik Brodowski2010-08-031-0/+13
| * | | pcmcia: use struct resource for PCMCIA devices, part 2Dominik Brodowski2010-08-0310-78/+75
| * | | pcmcia: remove memreq_tDominik Brodowski2010-08-0318-105/+42
| * | | pcmcia: move local definitions out of include/pcmcia/cs.hDominik Brodowski2010-08-033-19/+6
| * | | pcmcia: do not use io_req_t when calling pcmcia_request_io()Dominik Brodowski2010-08-0357-584/+527
| * | | pcmcia: do not use io_req_t after call to pcmcia_request_io()Dominik Brodowski2010-08-0351-240/+223
| * | | pcmcia: use struct resource for PCMCIA devicesDominik Brodowski2010-08-035-73/+95
| * | | pcmcia: clean up cs.hDominik Brodowski2010-08-032-12/+3
| * | | pcmcia: use pcmica_{read,write}_config_byteDominik Brodowski2010-08-0312-178/+104
| * | | pcmcia: remove cs_types.hDominik Brodowski2010-07-3090-151/+14
| * | | pcmcia: remove unused flag, simplify headersDominik Brodowski2010-07-303-26/+10
| * | | pcmcia: remove obsolete CS_EVENT_ definitionsDominik Brodowski2010-07-301-45/+0
| * | | pcmcia: split up central event handlerDominik Brodowski2010-07-303-92/+54
| * | | pcmcia: simplify event callbackDominik Brodowski2010-07-302-40/+10
| * | | pcmcia: remove obsolete ioctlDominik Brodowski2010-07-3010-1383/+7
| |/ /
* | | Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2010-08-0639-94/+517
|\ \ \
| * | | PCI: update for owner removal from struct device_attributeStephen Rothwell2010-08-041-2/+2
| * | | PCI: Fix warnings when CONFIG_DMI unsetNarendra K2010-08-021-2/+2
| * | | PCI: Do not run NVidia quirks related to MSI with MSI disabledRafael J. Wysocki2010-07-301-0/+3
| * | | x86/PCI: use for_each_pci_dev()Kulikov Vasiliy2010-07-301-3/+3