Merge branch 'master' of /home/airlied/kernel/linux-2.6 into drm-core…

…-next
git-mirror · Jan 4, 2011 · 4f12501 · 4f12501
2 parents 204663c + 989d873
commit 4f12501
Show file tree

Hide file tree

Showing 656 changed files with 6,373 additions and 4,634 deletions.
diff --git a/Documentation/accounting/getdelays.c b/Documentation/accounting/getdelays.c
@@ -516,6 +516,7 @@ int main(int argc, char *argv[])
 			default:
 				fprintf(stderr, "Unknown nla_type %d\n",
 					na->nla_type);
+			case TASKSTATS_TYPE_NULL:
 				break;
 			}
 			na = (struct nlattr *) (GENLMSG_DATA(&msg) + len);