summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* KVM: let the error pfn not depend on error codeXiao Guangrong2012-08-061-9/+15
* KVM: do not release the error pageXiao Guangrong2012-08-061-1/+1
* KVM: introduce KVM_ERR_PTR_BAD_PAGEXiao Guangrong2012-08-061-2/+7
* KVM: remove the unused declareXiao Guangrong2012-08-061-2/+0
* KVM: inline is_*_pfn functionsXiao Guangrong2012-08-061-3/+16
* KVM: introduce KVM_PFN_ERR_BADXiao Guangrong2012-08-061-0/+1
* KVM: introduce KVM_PFN_ERR_HWPOISONXiao Guangrong2012-08-061-1/+1
* KVM: introduce KVM_PFN_ERR_FAULTXiao Guangrong2012-08-061-1/+2
* KVM: Push rmap into kvm_arch_memory_slotTakuya Yoshikawa2012-08-061-1/+0
* Merge remote-tracking branch 'upstream' into nextAvi Kivity2012-08-05264-1911/+12947
|\
| * Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/v...Linus Torvalds2012-08-043-5/+0
| |\
| | * vfs: nuke pdflush from commentsArtem Bityutskiy2012-08-041-1/+0
| | * vfs: kill write_super and sync_supersArtem Bityutskiy2012-08-042-4/+0
| * | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/...Linus Torvalds2012-08-033-4/+4
| |\ \ | | |/ | |/|
| | *---. Merge branches 'delete-gts-bfs', 'misc', 'novell-bugzilla-757888-numa' and 'o...Len Brown2012-08-03470-7851/+18371
| | |\ \ \
| | | | * | ACPI: Only count valid srat memory structuresThomas Renninger2012-08-031-1/+1
| | * | | | ACPI: delete _GTS/_BFS supportLen Brown2012-07-302-3/+3
| | | |_|/ | | |/| |
| * | | | Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2012-08-032-11/+20
| |\ \ \ \
| | * | | | time/jiffies: Rename ACTHZ to SHIFTED_HZJohn Stultz2012-07-312-9/+14
| | * | | | time/jiffies: Allow CLOCK_TICK_RATE to be undefinedCatalin Marinas2012-07-311-4/+8
| * | | | | Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2012-08-032-1/+2
| |\ \ \ \ \
| | * | | | | sched: Fix comment about PREEMPT_ACTIVE bit locationSrivatsa S. Bhat2012-07-261-1/+1
| | * | | | | sched/numa: Add SD_PERFER_SIBLING to CPU domainAlex Shi2012-07-261-0/+1
| * | | | | | Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2012-08-034-4/+14
| |\ \ \ \ \ \
| | * | | | | | perf/trace: Add ability to set a target task for eventsAndrew Vagin2012-07-314-4/+14
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2012-08-031-0/+1
| |\ \ \ \ \ \
| | * | | | | | genirq: Allow irq chips to mark themself oneshot safeThomas Gleixner2012-07-251-0/+1
| | |/ / / / /
| * | | | | | Merge tag 'for_linux-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2012-08-031-2/+0
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | kdb: Remove unused KDB_FLAG_ONLY_DO_DUMPJason Wessel2012-07-311-2/+0
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpcLinus Torvalds2012-08-021-0/+41
| |\ \ \ \ \
| | * | | | | Platform: OLPC: turn EC driver into a platform_driverAndres Salomon2012-07-311-0/+6
| | * | | | | Platform: OLPC: allow EC cmd to be overridden, and create a workqueue to call itAndres Salomon2012-07-311-0/+6
| | * | | | | Platform: OLPC: add a stub to drivers/platform/ for the OLPC EC driverAndres Salomon2012-07-311-0/+29
| * | | | | | Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-shLinus Torvalds2012-08-021-0/+2
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'common/irqdomain' into sh-latestPaul Mundt2012-08-012-9/+34
| | |\ \ \ \ \ \
| | * | | | | | | dmaengine: shdma: restore partial transfer calculationGuennadi Liakhovetski2012-08-011-0/+2
| * | | | | | | | Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-08-012-148/+30
| |\ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \
| | *-. \ \ \ \ \ \ \ Merge branches 'dma-omap', 'dma-pl08x' and 'dma-sa11x0' into dmaengineRussell King2012-07-311-148/+8
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | dmaengine: PL08x: get rid of unnecessary checks in dma_slave_configRussell King2012-07-011-2/+3
| | | * | | | | | | | | dmaengine: PL08x: constify channel names and bus_id stringsRussell King2012-07-011-1/+1
| | | * | | | | | | | | dmaengine: PL08x: move private data structures into amba-pl08x.cRussell King2012-07-011-139/+2
| | | * | | | | | | | | dmaengine: PL08x: clean up get_signal/put_signalRussell King2012-07-011-2/+2
| | | * | | | | | | | | dmaengine: PL08x: remove circular_buffer boolean from channel dataRussell King2012-07-011-4/+0
| | | |/ / / / / / / /
| | * / / / / / / / / dmaengine: add OMAP DMA engine driverRussell King2012-07-311-0/+22
| | |/ / / / / / / /
| * | | | | | | | | Merge tag 'fbdev-updates-for-3.6' of git://github.com/schandinat/linux-2.6Linus Torvalds2012-08-014-45/+87
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | video: da8xx-fb: configure FIFO threshold to reduce underflow errorsManjunathappa, Prakash2012-07-291-0/+3
| | * | | | | | | | | Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into ...Florian Tobias Schandinat2012-07-251-25/+26
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | OMAPDSS: DSI: Fix HSYNC, VSYNC and DE polarities between DISPC and DSIArchit Taneja2012-06-291-3/+0
| | | * | | | | | | | | OMAPDSS: Add interlace parameter to omap_video_timingsArchit Taneja2012-06-291-0/+2
| | | * | | | | | | | | OMAPDSS: Remove omap_panel_config enum from omap_dss_deviceArchit Taneja2012-06-291-11/+0