1. 16 5月, 2012 37 次提交
  2. 15 5月, 2012 3 次提交
    • J
      genirq: export handle_edge_irq() and irq_to_desc() · 3911ff30
      Jiri Kosina 提交于
      Export handle_edge_irq() and irq_to_desc() to modules to allow them to
      do things such as
      
      	__irq_set_handler_locked(...., handle_edge_irq);
      
      This fixes
      
      	ERROR: "handle_edge_irq" [drivers/gpio/gpio-pch.ko] undefined!
      	ERROR: "irq_to_desc" [drivers/gpio/gpio-pch.ko] undefined!
      
      when gpio-pch is being built as a module.
      
      This was introduced by commit df9541a6 ("gpio: pch9: Use proper flow
      type handlers") that added
      
      	__irq_set_handler_locked(d->irq, handle_edge_irq);
      
      but handle_edge_irq() was not exported for modules (and inlined
      __irq_set_handler_locked() requires irq_to_desc() exported as well)
      Signed-off-by: NJiri Kosina <jkosina@suse.cz>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      3911ff30
    • L
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · b6255ee3
      Linus Torvalds 提交于
      Pull media fixes from Mauro Carvalho Chehab:
       "For a some fix patches for v3.4, including a regression fix at DVB core"
      
      Fix up trivial conflicts in Documentation/feature-removal-schedule.txt
      
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
        [media] gspca - sonixj: Fix a zero divide in isoc interrupt
        [media] media: videobuf2-dma-contig: include header for exported symbols
        [media] media: videobuf2-dma-contig: quiet sparse noise about plain integer as NULL pointer
        [media] media: vb2-memops: Export vb2_get_vma symbol
        [media] s5p-fimc: Correct memory allocation for VIDIOC_CREATE_BUFS
        [media] s5p-fimc: Fix locking in subdev set_crop op
        [media] dvb_frontend: fix a regression with DVB-S zig-zag
        [media] fintek-cir: change || to &&
        [media] V4L: Schedule V4L2_CID_HCENTER, V4L2_CID_VCENTER controls for removal
        [media] rc: Postpone ISR registration
        [media] marvell-cam: fix an ARM build error
        [media] V4L: soc-camera: protect hosts during probing from overzealous user-space
      b6255ee3
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · d69c5c2c
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
       "The main purpose of this pull request is to fix up the erroneous
        bonding patch I applied last round.  I meant to apply v4 of the patch
        from Jiri but I applied v3 by accident.  Mea culpa.
      
        Also, eagle eyed Dan Carpenter noticed that openvswitch has one of
        those "X = alloc(); if (!Y)" mistakes, test the proper pointer
        instead."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        openvswitch: checking wrong variable in queue_userspace_packet()
        bonding: Fix LACPDU rx_dropped commit.
      d69c5c2c