summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2012-05-2426-209/+99
|\
| * timers: Fixup the Kconfig consolidation falloutThomas Gleixner2012-05-2120-36/+0
| * 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
| * 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 branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds2012-05-243-5/+24
|\ \
| * | x86/vga: fix build with efi disabled.Dave Airlie2012-05-171-1/+1
| * | x86/vga: set the default device from the fixup.Dave Airlie2012-05-161-0/+3
| * | Merge tag 'v3.4-rc6' into drm-intel-nextDaniel Vetter2012-05-07173-936/+1217
| |\ \
| * \ \ Merge tag 'drm-intel-next-2012-04-23' of git://people.freedesktop.org/~danvet...Dave Airlie2012-05-0275-823/+601
| |\ \ \
| * | | | efifb: Implement vga_default_device() (v2)Matthew Garrett2012-04-241-0/+6
| * | | | x86: Use vga_default_device() when determining whether an fb is primaryMatthew Garrett2012-04-241-5/+15
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-05-243-10/+42
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2012-05-223-10/+42
| |\ \ \ \ \
| | * \ \ \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-nextJohn W. Linville2012-05-223-10/+42
| | |\ \ \ \ \
| | | * | | | | bcma: Move initialization of SPROM to prevent overwriteNathan Hintz2012-05-162-2/+4
| | | * | | | | MIPS: bcm47xx: read baordrev without prefix from spromHauke Mehrtens2012-05-161-0/+2
| | | * | | | | bcma: add boardinfo structHauke Mehrtens2012-05-163-0/+18
| | | * | | | | MIPS: bcm47xx: refactor fetching board dataHauke Mehrtens2012-05-163-6/+18
| | | * | | | | ssb: remove rev from boardinfoHauke Mehrtens2012-05-161-2/+0
* | | | | | | | Merge branch 'perf-uprobes-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2012-05-247-1/+761
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'perf/uprobes' of git://git.kernel.org/pub/scm/linux/kernel/git/...Ingo Molnar2012-05-14158-1394/+1863
| |\ \ \ \ \ \ \ \
| * | | | | | | | | tracing: Fix kconfig warning due to a typoSrikar Dronamraju2012-05-081-1/+1
| * | | | | | | | | tracing: Provide trace events interface for uprobesSrikar Dronamraju2012-05-071-1/+1
| * | | | | | | | | Merge branch 'perf/core' into perf/uprobesIngo Molnar2012-04-143484-65643/+72924
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | uprobes/core: Handle breakpoint and singlestep exceptionsSrikar Dronamraju2012-03-144-8/+281
| * | | | | | | | | Merge branch 'x86/cleanups' into perf/uprobesIngo Molnar2012-03-13297-4031/+3271
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | uprobes/core: Rename bkpt to swbpSrikar Dronamraju2012-03-131-2/+2