Shouldn't have removed agp.
Merge branch 'markj-kernel-config' into markj-develop