Merge quota update

diff --cc arch/ia64/ia32/ia32_entry.S
Simple merge

diff --cc fs/Makefile
index 29e7e14c0c746a3ad4e7565f2a3df78d969baf21,96d25da85a09f490bd0cb28f3abadfc9c65181bb..edf788e1388392c08e97214203cdc65952f9cfb8
--- 1/fs/Makefile
--- 2/fs/Makefile
+++ b/fs/Makefile
@@@ -16,7 -15,7 +16,7 @@@ obj-y :=      open.o read_write.o devices.o 
                namei.o fcntl.o ioctl.o readdir.o select.o fifo.o locks.o \
                dcache.o inode.o attr.o bad_inode.o file.o iobuf.o dnotify.o \
                filesystems.o namespace.o seq_file.o xattr.o libfs.o \
-               fs-writeback.o quota.o mpage.o
 -              fs-writeback.o
++              fs-writeback.o mpage.o
  
  ifneq ($(CONFIG_NFSD),n)
  ifneq ($(CONFIG_NFSD),)