From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 5 Oct 2011 19:36:22 +0000 (-0700)
Subject: Merge branch 'fk/use-kwset-pickaxe-grep-f'
X-Git-Tag: v1.7.8-rc0~131
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6cf5b81f3236ddc3be9967dc59dc948efbfbbeea;p=git.git

Merge branch 'fk/use-kwset-pickaxe-grep-f'

* fk/use-kwset-pickaxe-grep-f:
  obstack.c: Fix some sparse warnings
  sparse: Fix an "Using plain integer as NULL pointer" warning
---

6cf5b81f3236ddc3be9967dc59dc948efbfbbeea