pilppa.org Git - linux-2.6-omap-h63xx.git/commit

]> pilppa.org Git - linux-2.6-omap-h63xx.git/commit

author	Steven Whitehouse <swhiteho@redhat.com>
	Mon, 3 Jul 2006 14:25:08 +0000 (10:25 -0400)
committer	Steven Whitehouse <swhiteho@redhat.com>
	Mon, 3 Jul 2006 14:25:08 +0000 (10:25 -0400)
commit	0a1340c185734a57fbf4775927966ad4a1347b02
tree	d9ed8f0dd809a7c542a3356601125ea5b5aaa804	tree \| snapshot
parent	af18ddb8864b096e3ed4732e2d4b21c956dcfe3a	commit \| diff
parent	29454dde27d8e340bb1987bad9aa504af7081eba	commit \| diff

Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

include/linux/kernel.h

Unnamed repository; edit this file 'description' to name the repository.