From: Linus Torvalds Date: Tue, 24 Feb 2009 23:39:54 +0000 (-0800) Subject: Merge branch 'firedtv-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee139... X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a792cd12cf07cf77c7d1d41b46b4f8327ecf82d0;p=linux-2.6-omap-h63xx.git Merge branch 'firedtv-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'firedtv-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firedtv: dvb_frontend_info for FireDTV S2, fix "frequency limits undefined" error firedtv: massive refactoring firedtv: rename files, variables, functions from firesat to firedtv firedtv: Use DEFINE_SPINLOCK firedtv: fix registration - adapter number could only be zero firedtv: use length_field() of PMT as length firedtv: fix returned struct for ca_info firedtv: cleanups and minor fixes ieee1394: remove superfluous assertions ieee1394: inherit ud vendor_id from node vendor_id ieee1394: add hpsb_node_read() and hpsb_node_lock() ieee1394: use correct barrier types between accesses of nodeid and generation firesat: copyrights, rename to firedtv, API conversions, fix remote control input firesat: avc resend firesat: update isochronous interface, add CI support firesat: add DVB-S support for DVB-S2 devices firesat: fix DVB-S2 device recognition DVB: add firesat driver --- a792cd12cf07cf77c7d1d41b46b4f8327ecf82d0