Merge commit 'v2.6.29' into core/header-fixes

diff --cc arch/ia64/include/asm/kvm.h
index 116761ca462d88ff3236b725d15db3425b941a7d,bfa86b6af7cd0774d652c99d800e822284f74c23..2b0a38e847059fd18d995a01eff7ac178adda084
--- 1/arch/ia64/include/asm/kvm.h
--- 2/arch/ia64/include/asm/kvm.h
+++ b/arch/ia64/include/asm/kvm.h
@@@ -21,9 -21,14 +21,13 @@@
   *
   */
  
 -#include <asm/types.h>
 -
 +#include <linux/types.h>
  #include <linux/ioctl.h>
  
+ /* Select x86 specific features in <linux/kvm.h> */
+ #define __KVM_HAVE_IOAPIC
+ #define __KVM_HAVE_DEVICE_ASSIGNMENT
+ 
  /* Architectural interrupt line count. */
  #define KVM_NR_INTERRUPTS 256
  

diff --cc include/drm/i915_drm.h
Simple merge

diff --cc include/linux/netfilter/xt_NFLOG.h
index eaac7b5226e9fc961be793fab52182932557c3bc,4b36aeb46a102a14f7b261cbbd00819243e920da..87b58311ce6b45b49c535625901683cce0ee5b93
--- 1/include/linux/netfilter/xt_NFLOG.h
--- 2/include/linux/netfilter/xt_NFLOG.h
+++ b/include/linux/netfilter/xt_NFLOG.h
@@@ -1,10 -1,8 +1,10 @@@
  #ifndef _XT_NFLOG_TARGET
  #define _XT_NFLOG_TARGET
  
 +#include <linux/types.h>
 +
  #define XT_NFLOG_DEFAULT_GROUP                0x1
- #define XT_NFLOG_DEFAULT_THRESHOLD    1
+ #define XT_NFLOG_DEFAULT_THRESHOLD    0
  
  #define XT_NFLOG_MASK                 0x0