git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic

author	Trond Myklebust <Trond.Myklebust@netapp.com>
	Wed, 21 Jun 2006 00:46:21 +0000 (20:46 -0400)
committer	Trond Myklebust <Trond.Myklebust@netapp.com>
	Wed, 21 Jun 2006 00:46:21 +0000 (20:46 -0400)
commit	70ac4385a13f78bc478f26d317511893741b05bd
tree	dafc7f3018295fc4ee00339889e4f35d5b9d7743	tree \| snapshot (tar.gz zip)
parent	d59bf96cdde5b874a57bfd1425faa45da915d0b7	commit \| diff
parent	077e98945db7e54a9865b5f29a1f02f531eca414	commit \| diff

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

include/linux/nfs_fs.h

Fixed up conflict with kernel header updates.