Merge remote-tracking branch 'xfs/master'

diff --cc fs/xfs/Makefile
index 75bb316529ddabb27855025fd59832bc4a52a4c8,ffce328309b80dffda514dc5258cd52994cc6334..427a4e82a588759dbfb49394f73eca9400d455e7
--- 1/fs/xfs/Makefile
--- 2/fs/xfs/Makefile
+++ b/fs/xfs/Makefile
@@@ -16,10 -16,7 +16,9 @@@
  # Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  #
  
- ccflags-y := -I$(src) -I$(src)/linux-2.6
- ccflags-$(CONFIG_XFS_DEBUG) += -g
++ccflags-y += -I$(src)                 # needed for trace events
 +
- XFS_LINUX := linux-2.6
+ ccflags-$(CONFIG_XFS_DEBUG) += -g
  
  obj-$(CONFIG_XFS_FS)          += xfs.o