summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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-08-011-0/+6
| * Platform: OLPC: allow EC cmd to be overridden, and create a workqueue to call itAndres Salomon2012-08-011-0/+6
| * Platform: OLPC: add a stub to drivers/platform/ for the OLPC EC driverAndres Salomon2012-08-011-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-022-148/+30Star
|\ \ \ \
| | \ \ \
| | \ \ \
| *-. \ \ \ Merge branches 'dma-omap', 'dma-pl08x' and 'dma-sa11x0' into dmaengineRussell King2012-07-311-148/+8Star
| |\ \ \ \ \
| | * | | | | 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/+2Star
| | * | | | | 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/+0Star
| | |/ / / /
| * / / / / 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/+0Star
| | * | | | | 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/+0Star
| | * | | | | OMAPDSS: Add some new fields to omap_video_timingsArchit Taneja2012-06-291-0/+22
| | * | | | | OMAPDSS: Remove passive matrix LCD support (part 3)Archit Taneja2012-06-291-5/+0Star
| | * | | | | OMAPDSS: Remove passive matrix LCD support (part 2)Archit Taneja2012-06-291-2/+0Star
| | * | | | | OMAPDSS: Add LCD3 overlay manager and Clock and IRQ supportChandrabhanu Mahapatra2012-06-291-0/+4
| | * | | | | OMAPDSS: Add support for LCD3 channelChandrabhanu Mahapatra2012-06-291-0/+1
| | * | | | | OMAPDSS: remove enum omap_dss_overlay_managersTomi Valkeinen2012-06-281-7/+0Star
| * | | | | | sh_mobile_meram: Add direct MERAM allocation APILaurent Pinchart2012-07-191-0/+16
| * | | | | | sh_mobile_meram: Use direct function calls for the public APILaurent Pinchart2012-07-191-15/+35
| * | | | | | sh_mobile_meram: Rename operations to cache_[alloc|free|update]Laurent Pinchart2012-07-191-13/+8Star
| * | | | | | fbdev: sh_mobile_lcdc: Implement overlays supportLaurent Pinchart2012-06-201-0/+7
* | | | | | | Merge tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/...Linus Torvalds2012-08-011-0/+1
|\ \ \ \ \ \ \
| * | | | | | | ALSA: es1688 - freeup resources on init failureFengguang Wu2012-07-301-0/+1
* | | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-08-016-12/+151
|\ \ \ \ \ \ \ \
| * | | | | | | | fs: Remove old freezing mechanismJan Kara2012-07-311-5/+0Star
| * | | | | | | | fs: Improve filesystem freezing handlingJan Kara2012-07-311-7/+143
| * | | | | | | | nfsd: Push mnt_want_write() outside of i_mutexJan Kara2012-07-301-0/+1
| * | | | | | | | mm: Make default vm_ops provide ->page_mkwrite handlerJan Kara2012-07-301-0/+1
| * | | | | | | | fs: add link restriction audit reportingKees Cook2012-07-291-0/+4
| * | | | | | | | fs: add link restrictionsKees Cook2012-07-291-0/+2
| * | | | | | | | consolidate pipe file creationAl Viro2012-07-292-3/+2Star
| * | | | | | | | new helper: done_path_create()Al Viro2012-07-291-0/+1
* | | | | | | | | Merge branch 'for-3.6/drivers' of git://git.kernel.dk/linux-blockLinus Torvalds2012-08-011-2/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | blk: pass from_schedule to non-request unplug functions.NeilBrown2012-07-311-1/+1
| * | | | | | | | | blk: centralize non-request unplug handling.NeilBrown2012-07-311-2/+6
| * | | | | | | | | Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-3.6/driversJens Axboe2012-07-3071-125/+494
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'for-3.6/core' of git://git.kernel.dk/linux-blockLinus Torvalds2012-08-015-23/+92
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | block: add partition resize function to blkpg ioctlVivek Goyal2012-08-012-0/+58
| |/ / / / / / / / / /
| * | | | | | | | | | blkcg: implement per-blkg request allocationTejun Heo2012-06-271-3/+9
| * | | | | | | | | | block: prepare for multiple request_listsTejun Heo2012-06-251-14/+18