Skip to main content

Browse the archive

Revision 67577927e8d7a1f4b09b4992df640eadc6aacb36 authored by David Woodhouse on 30 October 2010, 11:35:11 UTC, committed by David Woodhouse on 30 October 2010, 11:35:11 UTC 
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
 
Conflicts:
	drivers/mtd/mtd_blkdevs.c

Merge Grant's device-tree bits so that we can apply the subsequent fixes.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2 parent s 6fe4c59 + 51f00a4
History
File Mode Size
firewire
perf
usb
back to top