Merge commit 'v2.6.37' into sched/core

Merge reason: Merge the final .37 tree.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2011-01-05 14:14:42 +01:00
424 changed files with 4337 additions and 3099 deletions
+1 -1
View File
@@ -93,7 +93,7 @@ no_match:
*
* Returns the matching dev_t on success or 0 on failure.
*/
static dev_t __init devt_from_partuuid(char *uuid_str)
static dev_t devt_from_partuuid(char *uuid_str)
{
dev_t res = 0;
struct device *dev = NULL;