[linux-yocto] [PATCH 0/2] Clean up some cfg files

[Saul Wold]

Found this trying to debug something else. The ip_nf goes into
4.1 and newer.  The firmware one goes into 4.4 and newer.

Sau!


Saul Wold (2):
  ip_nf.cfg: clean up bad merge lines
  firmware.cfg: clean up bad merge lines

 cfg/net/ip_nf.cfg              | 5 -----
 features/firmware/firmware.cfg | 6 +++---
 2 files changed, 3 insertions(+), 8 deletions(-)

-- 
2.7.4