Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

diff --cc Documentation/vm/page-types.c
Simple merge

diff --cc arch/arm/mach-s3c6410/Kconfig
Simple merge

diff --cc arch/arm/plat-omap/dma.c
Simple merge

diff --cc arch/x86/kernel/amd_iommu.c
index 32fb091,42ac5e0..1c0fb4d
--- 1/arch/x86/kernel/amd_iommu.c
--- 2/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@@ -2486,11 -2393,10 +2486,11 @@@ static struct iommu_ops amd_iommu_ops 
  
  int __init amd_iommu_init_passthrough(void)
  {
 +      struct amd_iommu *iommu;
        struct pci_dev *dev = NULL;
 -      u16 devid, devid2;
 +      u16 devid;
  
-       /* allocate passthroug domain */
+       /* allocate passthrough domain */
        pt_domain = protection_domain_alloc();
        if (!pt_domain)
                return -ENOMEM;

diff --cc arch/x86/kernel/cpu/perf_event.c
Simple merge

diff --cc arch/x86/kernel/kprobes.c
Simple merge

diff --cc arch/x86/mm/kmmio.c
Simple merge

diff --cc drivers/ata/sata_fsl.c
Simple merge

diff --cc drivers/gpu/drm/radeon/atombios.h
Simple merge

diff --cc drivers/gpu/drm/radeon/r600.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_ttm.c
Simple merge

diff --cc drivers/gpu/drm/radeon/rv770.c
Simple merge

diff --cc drivers/isdn/hardware/eicon/maintidi.c
Simple merge

diff --cc drivers/isdn/hisax/hfc_usb.c
Simple merge

diff --cc drivers/isdn/i4l/isdn_ppp.c
index 642d5aa,0f4ea7d..45df667
--- 1/drivers/isdn/i4l/isdn_ppp.c
--- 2/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@@ -1657,24 -1659,33 +1657,24 @@@ static void isdn_ppp_mp_receive(isdn_ne
                                         * packets */
        newfrag = skb;
  
 -      /* Insert new fragment into the proper sequence slot.  */
 -      skb_queue_walk(&mp->frags, frag) {
 -              if (MP_SEQ(frag) == newseq) {
 -                      isdn_ppp_mp_free_skb(mp, newfrag);
 -                      newfrag = NULL;
 -                      break;
 -              }
 -              if (MP_LT(newseq, MP_SEQ(frag))) {
 -                      __skb_queue_before(&mp->frags, frag, newfrag);
 -                      newfrag = NULL;
 -                      break;
 -              }
 -      }
 -      if (newfrag)
 -              __skb_queue_tail(&mp->frags, newfrag);
 +      /* if this new fragment is before the first one, then enqueue it now. */
 +      if ((frag = mp->frags) == NULL || MP_LT(newseq, MP_SEQ(frag))) {
 +              newfrag->next = frag;
 +              mp->frags = frag = newfrag;
 +              newfrag = NULL;
 +      }
  
 -      frag = skb_peek(&mp->frags);
 -      start = ((MP_FLAGS(frag) & MP_BEGIN_FRAG) &&
 -               (MP_SEQ(frag) == mp->seq)) ? frag : NULL;
 -      if (!start)
 -              goto check_overflow;
 +      start = MP_FLAGS(frag) & MP_BEGIN_FRAG &&
 +                              MP_SEQ(frag) == mp->seq ? frag : NULL;
  
 -      /* main fragment traversing loop
 +      /* 
 +       * main fragment traversing loop
         *
         * try to accomplish several tasks:
 +       * - insert new fragment into the proper sequence slot (once that's done
 +       *   newfrag will be set to NULL)
         * - reassemble any complete fragment sequence (non-null 'start'
-        *   indicates there is a continguous sequence present)
+        *   indicates there is a contiguous sequence present)
         * - discard any incomplete sequences that are below minseq -- due
         *   to the fact that sender always increment sequence number, if there
         *   is an incomplete sequence below minseq, no new fragments would

diff --cc drivers/media/video/s2255drv.c
Simple merge

diff --cc drivers/net/benet/be_cmds.h
Simple merge

diff --cc drivers/net/benet/be_main.c
Simple merge

diff --cc drivers/net/cxgb3/sge.c
Simple merge

diff --cc drivers/net/s2io.c
Simple merge

diff --cc drivers/net/smsc911x.c
Simple merge

diff --cc drivers/net/wireless/b43/main.c
Simple merge

diff --cc drivers/net/wireless/ipw2x00/ipw2100.c
Simple merge

diff --cc drivers/net/wireless/ipw2x00/ipw2200.c
Simple merge

diff --cc drivers/net/wireless/ipw2x00/libipw_module.c
Simple merge

diff --cc drivers/net/wireless/wavelan_cs.c
Simple merge

diff --cc drivers/platform/x86/thinkpad_acpi.c
Simple merge

diff --cc drivers/rtc/rtc-v3020.c
Simple merge

diff --cc drivers/scsi/pmcraid.c
Simple merge

diff --cc drivers/usb/host/ehci-hcd.c
Simple merge

diff --cc drivers/video/atmel_lcdfb.c
Simple merge

diff --cc drivers/video/gbefb.c
Simple merge

diff --cc fs/btrfs/extent_map.c
Simple merge

diff --cc fs/cifs/inode.c
Simple merge

diff --cc fs/compat_ioctl.c
Simple merge

diff --cc fs/ext3/inode.c
Simple merge

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/ocfs2/refcounttree.c
Simple merge

diff --cc include/net/sctp/structs.h
Simple merge

diff --cc kernel/irq/spurious.c
Simple merge

diff --cc kernel/perf_event.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc lib/swiotlb.c
Simple merge

diff --cc net/sctp/sm_sideeffect.c
Simple merge

diff --cc net/sctp/sm_statefuns.c
Simple merge

diff --cc samples/Kconfig
index e4be84a,04be681..8924f72
--- 1/samples/Kconfig
--- 2/samples/Kconfig
+++ b/samples/Kconfig
@@@ -40,11 -38,4 +38,10 @@@ config SAMPLE_KRETPROBE
        default m
        depends on SAMPLE_KPROBES && KRETPROBES
  
 +config SAMPLE_HW_BREAKPOINT
 +      tristate "Build kernel hardware breakpoint examples -- loadable module only"
 +      depends on HAVE_HW_BREAKPOINT && m
 +      help
 +        This builds kernel hardware breakpoint example modules.
 +
  endif # SAMPLES
- 

diff --cc security/selinux/ss/services.c
Simple merge

diff --cc sound/pci/hda/patch_realtek.c
Simple merge