Changes in sysfs-bus-media

e5451c8f8330e03ad3cfa16048b4daf961af434f - Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochip

Tue, 23 Feb 2016 15:07:08 +0100

Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochipBase for demv_gpiochip_add_data() and devm_gpiochip_remove(). List of files: /linux/Documentation/ABI/testing/sysfs-bus-media

94bd217e2d683719ab21a4ac117d8a1b91cbedc9 - Merge commit 'v3.1-rc2' into HEAD

Wed, 17 Aug 2011 18:14:01 +0200

Merge commit 'v3.1-rc2' into HEAD List of files: /linux/Documentation/ABI/testing/sysfs-bus-media

6288cf1e768ae73db5ddaaae54d85245cc1c2b56 - Merge branches 'acpica', 'aml-custom', 'bugzilla-16548', 'bugzilla-20242', 'd3-cold', 'ec-asus' and 'thermal-fix' into release

Sun, 29 May 2011 10:38:48 +0200

Merge branches 'acpica', 'aml-custom', 'bugzilla-16548', 'bugzilla-20242', 'd3-cold', 'ec-asus' and 'thermal-fix' into release List of files: /linux/Documentation/ABI/testing/sysfs-bus-media

ea77f7a2e8561012cf100c530170f12351c3b53e - Merge commit 'v2.6.39' into 20110526

Thu, 26 May 2011 23:20:14 +0200

Merge commit 'v2.6.39' into 20110526Conflicts: lib/flex_array.c security/selinux/avc.c security/selinux/hooks.c security/selinux/ss/policydb.c security/smack/smack_lsm.c List of files: /linux/Documentation/ABI/testing/sysfs-bus-media

b73077eb03f510a84b102fb97640e595a958403c - Merge branch 'next' into for-linus

Tue, 24 May 2011 09:06:26 +0200

Merge branch 'next' into for-linus List of files: /linux/Documentation/ABI/testing/sysfs-bus-media

03351ff4d897098a590cb247b6eebc470b8ecb5a - Merge commit 'v2.6.39-rc4' into next

Sat, 23 Apr 2011 08:35:25 +0200

Merge commit 'v2.6.39-rc4' into next List of files: /linux/Documentation/ABI/testing/sysfs-bus-media

366a2382c68d01638350efcf23d46a47d661c595 - Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus

Mon, 23 May 2011 12:49:25 +0200

Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus List of files: /linux/Documentation/ABI/testing/sysfs-bus-media

6b7b8e488bbdedeccabdd001a78ffcbe43bb8a3a - Merge branch 'master' into upstream.

Wed, 18 May 2011 17:06:31 +0200

Merge branch 'master' into upstream.This is sync with Linus' tree to receive KEY_IMAGES definitionthat went in through input tree. List of files: /linux/Documentation/ABI/testing/sysfs-bus-media

a18f22a968de17b29f2310cdb7ba69163e65ec15 - Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource

Sat, 14 May 2011 12:06:36 +0200

Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksourceConflicts: arch/ia64/kernel/cyclone.c arch/mips/kernel/i8253.c arch/x86/kernel/i8253.cReason: Resolve conflicts so further cleanups do not conflict furtherSigned-off-by: Thomas Gleixner List of files: /linux/Documentation/ABI/testing/sysfs-bus-media

020abf03cd659388f94cb328e1e1df0656e0d7ff - Merge tag 'v2.6.39-rc7'

Tue, 10 May 2011 20:52:07 +0200

Merge tag 'v2.6.39-rc7'in order to pull in changes in drivers/media/dvb/firewire/ andsound/firewire/. List of files: /linux/Documentation/ABI/testing/sysfs-bus-media

4cb1f43ce8c72ee453c00fcb9f6ee9c4ebd03f98 - Merge commit 'v2.6.39-rc6' into x86/cleanups

Sat, 07 May 2011 10:51:38 +0200

Merge commit 'v2.6.39-rc6' into x86/cleanupsMerge reason: move to a (much) newer upstream base.Signed-off-by: Ingo Molnar List of files: /linux/Documentation/ABI/testing/sysfs-bus-media

07f9479a40cc778bc1462ada11f95b01360ae4ff - Merge branch 'master' into for-next

Tue, 26 Apr 2011 10:22:15 +0200

Merge branch 'master' into for-nextFast-forwarded to current state of Linus' tree as there are patches to beapplied for files that didn't exist on the old branch. List of files: /linux/Documentation/ABI/testing/sysfs-bus-media

b32e3dc7860d00124fa432dba09667e647cb9bcc - Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

Wed, 13 Apr 2011 13:32:28 +0200

Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6 List of files: /linux/Documentation/ABI/testing/sysfs-bus-media

f94f3cb37a1c4d44dd2070cc4a6165689bda9c92 - Merge branch 'for-2.6.39' into for-2.6.40

Sun, 03 Apr 2011 12:29:43 +0200

Merge branch 'for-2.6.39' into for-2.6.40 List of files: /linux/Documentation/ABI/testing/sysfs-bus-media

cdccfc8dc0bf62a1da327324a8d639139acc9279 - Merge branch 'fix/misc' into topic/misc

Mon, 28 Mar 2011 13:03:58 +0200

Merge branch 'fix/misc' into topic/misc List of files: /linux/Documentation/ABI/testing/sysfs-bus-media

f6994ce4a8180ea0093c62a61d697086855058e7 - Merge branch 'fix/hda' into topic/hda

Mon, 28 Mar 2011 13:03:39 +0200

Merge branch 'fix/hda' into topic/hda List of files: /linux/Documentation/ABI/testing/sysfs-bus-media

72ed73c3f0801e860ee27e53ab6aaf47941ba324 - Merge branch 'x86-platform-next' into x86-platform

Mon, 28 Mar 2011 12:47:38 +0200

Merge branch 'x86-platform-next' into x86-platform List of files: /linux/Documentation/ABI/testing/sysfs-bus-media

7bf7e370d5919112c223a269462cd0b546903829 - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus-1

Fri, 25 Mar 2011 16:41:20 +0100

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus-1* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6: (9356 commits) [media] rc: update for bitop name changes fs: simplify iget & friends fs: pull inode->i_lock up out of writeback_single_inode fs: rename inode_lock to inode_hash_lock fs: move i_wb_list out from under inode_lock fs: move i_sb_list out from under inode_lock fs: remove inode_lock from iput_final and prune_icache fs: Lock the inode LRU list separately fs: factor inode disposal fs: protect inode->i_state with inode->i_lock lib, arch: add filter argument to show_mem and fix private implementations SLUB: Write to per cpu data when allocating it slub: Fix debugobjects with lockless fastpath autofs4: Do not potentially dereference NULL pointer returned by fget() in autofs_dev_ioctl_setpipefd() autofs4 - remove autofs4_lock autofs4 - fix d_manage() return on rcu-walk autofs4 - fix autofs4_expire_indirect() traversal autofs4 - fix dentry leak in autofs4_expire_direct() autofs4 - reinstate last used update on access vfs - check non-mountpoint dentry might block in __follow_mount_rcu() ...NOTE!This merge commit was created to fix compilation error. The blocktree was merged upstream and removed the 'elv_queue_empty()'function which the new 'mtdswap' driver is using. So a simplemerge of the mtd tree with upstream does not compile. And themtd tree has already be published, so re-basing it is not an option.To fix this unfortunate situation, I had to merge upstream into themtd-2.6.git tree without committing, put the fixup patch on top ofthis, and then commit this. The result is that we do not have commitswhich do not compile.In other words, this merge commit "merges" 3 things: the MTD tree, theupstream tree, and the fixup patch. List of files: /linux/Documentation/ABI/testing/sysfs-bus-media

76d21c563569bcea6bc67d65cc2c460cff643058 - Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

Thu, 24 Mar 2011 17:50:13 +0100

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (442 commits) [media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly [media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE [media] v4l: soc-camera: Store negotiated buffer settings [media] rc: interim support for 32-bit NEC-ish scancodes [media] mceusb: topseed 0x0011 needs gen3 init for tx to work [media] lirc_zilog: error out if buffer read bytes != chunk size [media] lirc: silence some compile warnings [media] hdpvr: use same polling interval as other OS [media] ir-kbd-i2c: pass device code w/key in hauppauge case [media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge [media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping [media] rc-rc5-hauppauge-new: Add support for the old Black RC [media] rc-rc5-hauppauge-new: Add the old control to the table [media] rc-winfast: Fix the keycode tables [media] a800: Fix a few wrong IR key assignments [media] opera1: Use multimedia keys instead of an app-specific mapping [media] dw2102: Use multimedia keys instead of an app-specific mapping ...Fix up trivial conflicts (remove/modify and some real conflicts) in: arch/arm/mach-omap2/devices.c drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/dabusb/dabusb.c drivers/staging/dabusb/dabusb.h drivers/staging/easycap/easycap_ioctl.c drivers/staging/usbvideo/usbvideo.c drivers/staging/usbvideo/vicam.c List of files: /linux/Documentation/ABI/testing/sysfs-bus-media

176fb0d108f7495ccf9aa127e1342a1a0d87e004 - [media] media: Media device

Wed, 09 Dec 2009 12:39:58 +0100

[media] media: Media deviceThe media_device structure abstracts functions common to all kind ofmedia devices (v4l2, dvb, alsa, ...). It manages media entities andoffers a userspace API to discover and configure the media deviceinternal topology.Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab List of files: /linux/Documentation/ABI/testing/sysfs-bus-media