https://github.com/torvalds/linux
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
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
Tip revision: 67577927e8d7a1f4b09b4992df640eadc6aacb36 authored 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
Tip revision: 6757792
File Mode Size
Documentation
arch
block
crypto
drivers
firmware
fs
include
init
ipc
kernel
lib
mm
net
samples
scripts
security
sound
tools
usr
virt
.gitignore -rw-r--r-- 936 bytes
.mailmap -rw-r--r-- 3.9 KB
COPYING -rw-r--r-- 18.3 KB
CREDITS -rw-r--r-- 91.8 KB
Kbuild -rw-r--r-- 2.5 KB
MAINTAINERS -rw-r--r-- 178.2 KB
Makefile -rw-r--r-- 51.2 KB
README -rw-r--r-- 17.0 KB
REPORTING-BUGS -rw-r--r-- 3.3 KB

README

back to top