linux-2.6-xfs-all/.gitignore.rej - view

Return to .gitignore.rej CVS log

Up to [Development] / linux-2.6-xfs-all

File: [Development] / linux-2.6-xfs-all / Attic / .gitignore.rej (download)

Revision 1.1, Mon Feb 13 14:31:31 2006 UTC (11 years, 8 months ago) by nathans.longdrop.melbourne.sgi.com
Branch: MAIN

Merge up to 2.6.16-rc3.
Merge of 2.6.x-xfs-melb:linux:25182a by kenmcd.

***************
*** 10,15 ****
  *.a
  *.s
  *.ko
  *.mod.c
  
  #
--- 10,16 ----
  *.a
  *.s
  *.ko
+ *.so
  *.mod.c
  
  #
*************** Module.symvers
*** 23,28 ****
  # Generated include files
  #
  include/asm
  include/config
  include/linux/autoconf.h
  include/linux/compile.h
--- 24,30 ----
  # Generated include files
  #
  include/asm
+ include/asm-*/asm-offsets.h
  include/config
  include/linux/autoconf.h
  include/linux/compile.h