Merge branch 'master' into next

This commit is contained in:
James Morris
2009-12-03 12:03:40 +05:30
2774 changed files with 122255 additions and 46649 deletions

View File

@@ -670,6 +670,7 @@ and is between 256 and 4096 characters. It is defined in the file
earlyprintk= [X86,SH,BLACKFIN]
earlyprintk=vga
earlyprintk=serial[,ttySn[,baudrate]]
earlyprintk=ttySn[,baudrate]
earlyprintk=dbgp[debugController#]
Append ",keep" to not disable it when the real console