tree 860b95e9a499ade4060848740fc6ce1fbb4e4e8d
parent 70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3
parent 5bae7ac9feba925fd0099057f6b23d7be80b7b41
author Steve French <sfrench@us.ibm.com> 1184805537 +0000
committer Steve French <sfrench@us.ibm.com> 1184805537 +0000

Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	fs/cifs/export.c