Commit a289bbe2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 

* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
  [XFS] Update the MAINTAINERS file entry for XFS - change git repo name.
  [XFS] s/memclear_highpage_flush/zero_user_page/
  [XFS] Update the MAINTAINERS file entry for XFS.
parents 41e904de e99f056b

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -4022,11 +4022,11 @@ S: Supported 


XFS FILESYSTEM

P:	Silicon Graphics Inc

P:	Tim Shimmin, David Chatterton

P:	Tim Shimmin

M:	xfs-masters@oss.sgi.com

L:	xfs@oss.sgi.com

W:	http://oss.sgi.com/projects/xfs

T:	git git://oss.sgi.com:8090/xfs/xfs-2.6

T:	git git://oss.sgi.com:8090/xfs/xfs-2.6.git

S:	Supported



XILINX UARTLITE SERIAL DRIVER

fs/xfs/linux-2.6/xfs_lrw.c

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ xfs_iozero( 
		if (status)

			goto unlock;



		memclear_highpage_flush(page, offset, bytes);

		zero_user_page(page, offset, bytes, KM_USER0);



		status = mapping->a_ops->commit_write(NULL, page, offset,

							offset + bytes);