summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma...Linus Torvalds2012-04-043-6/+15
|\
| * common: DMA-mapping: add NON-CONSISTENT attributeMarek Szyprowski2012-03-281-0/+1
| * common: DMA-mapping: add WRITE_COMBINE attributeMarek Szyprowski2012-03-281-0/+1
| * common: dma-mapping: introduce mmap methodMarek Szyprowski2012-03-281-0/+3
| * common: dma-mapping: remove old alloc_coherent and free_coherent methodsMarek Szyprowski2012-03-281-4/+0
| * X86 & IA64: adapt for dma_map_ops changesAndrzej Pietrasiewicz2012-03-281-2/+4
| * common: dma-mapping: introduce generic alloc() and free() methodsMarek Szyprowski2012-03-281-0/+6
* | Merge tag 'pm-for-3.4-part-2' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2012-04-042-5/+26
|\ \
| * | PM / QoS: add pm_qos_update_request_timeout() APIMyungJoo Ham2012-03-281-0/+4
| * | PM / Sleep: Mitigate race between the freezer and request_firmware()Rafael J. Wysocki2012-03-281-2/+19
| * | firmware_class: Do not warn that system is not ready from async loadsRafael J. Wysocki2012-03-281-0/+1
| * | firmware_class: Rework usermodehelper checkRafael J. Wysocki2012-03-281-3/+2
* | | Merge branch 'selinux' ("struct common_audit_data" sanitizer)Linus Torvalds2012-04-041-71/+25
|\ \ \
| * | | lsm_audit: don't specify the audit pre/post callbacks in 'struct common_audit...Linus Torvalds2012-04-031-4/+3
| * | | LSM: shrink the common_audit_data data unionEric Paris2012-04-031-17/+18
| * | | LSM: shrink sizeof LSM specific portion of common_audit_dataEric Paris2012-04-031-50/+4
* | | | Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/br...Linus Torvalds2012-04-041-5/+3
|\ \ \ \
| * | | | regulator: Fix comments in include/linux/regulator/machine.hAxel Lin2012-03-291-5/+3
* | | | | Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2012-04-041-1/+1
|\ \ \ \ \
| * | | | | tracing, sched, vfs: Fix 'old_pid' usage in trace_sched_process_exec()Oleg Nesterov2012-03-311-1/+1
* | | | | | Merge branch 'drm-fixes-intel' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds2012-04-031-0/+4
|\ \ \ \ \ \
| * | | | | | drm/i915: disable ppgtt on snb when dmar is enabledDaniel Vetter2012-04-021-0/+4
* | | | | | | Merge branch 'drm-prime-dmabuf-initial' of git://people.freedesktop.org/~airl...Linus Torvalds2012-04-022-1/+75
|\ \ \ \ \ \ \
| * | | | | | | drm: base prime/dma-buf support (v5)Dave Airlie2012-03-302-1/+75
* | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-04-022-3/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | eql: dont rely on HZ=100Eric Dumazet2012-03-271-1/+1
| * | | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2012-03-271-2/+4
| |\ \ \ \ \ \ \
| | * | | | | | | cfg80211: allow CFG80211_SIGNAL_TYPE_UNSPEC in station_infoJohn W. Linville2012-03-261-2/+4
* | | | | | | | | Merge branch 'paul' (Fixups from Paul Gortmaker)Linus Torvalds2012-04-023-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | asm-generic: add linux/types.h to cmpxchg.hPaul Gortmaker2012-04-021-0/+1
| * | | | | | | | | firewire: restore the device.h include in linux/firewire.hPaul Gortmaker2012-04-021-2/+1
| * | | | | | | | | avr32: fix build failures from mis-naming of atmel_nand.hPaul Gortmaker2012-04-021-3/+3
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsiLinus Torvalds2012-04-024-0/+475
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | HSI: hsi_char: Add HSI char device kernel configurationAndras Domokos2012-01-052-0/+2
| * | | | | | | | | HSI: hsi_char: Add HSI char device driverAndras Domokos2012-01-051-0/+63
| * | | | | | | | | HSI: hsi: Introducing HSI frameworkCarlos Chinea2012-01-051-0/+410
* | | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2012-04-023-0/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | crypto: user - Fix size of netlink dump messageSteffen Klassert2012-03-291-0/+3
| * | | | | | | | | | crypto: user - Fix lookup of algorithms with IV generatorSteffen Klassert2012-03-292-0/+4
* | | | | | | | | | | Merge tag 'for-linus' of git://github.com/rustyrussell/linuxLinus Torvalds2012-04-021-6/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | cpumask: remove old cpu_*_map.Rusty Russell2012-03-291-6/+0
* | | | | | | | | | | Merge branch 's3-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/am...Linus Torvalds2012-03-311-1/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | virtio: drop thaw PM operationAmit Shah2012-03-311-1/+0
* | | | | | | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-03-317-2137/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ext3: move headers to fs/ext3/Al Viro2012-03-314-1451/+0
| * | | | | | | | | | | | migrate ext2_fs.h guts to fs/ext2/ext2.hAl Viro2012-03-312-646/+1
| * | | | | | | | | | | | new helper: ext2_image_size()Al Viro2012-03-311-0/+22
| * | | | | | | | | | | | ext2: No longer export ext2_fs.h to user spaceThierry Reding2012-03-312-63/+10
* | | | | | | | | | | | | Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2012-03-314-16/+94
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'linus' into perf/urgentIngo Molnar2012-03-26449-5941/+8628
| |\ \ \ \ \ \ \ \ \ \ \ \