From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Thu, 27 Jan 2005 20:47:56 +0000 (+0000)
Subject: - merge revision 1.2
X-Git-Tag: planetlab-3_0-rc10~16
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9f2cb7c761ea24d9d9622886f4f2d3fb2469be9b;p=linux-2.6.git

- merge revision 1.2
date: 2005/01/10 19:05:12;  author: mlhuang;  state: Exp;  lines: +60 -59
- fix DEBUGP() macro; newer gcc versions refuse to concatenate __FILE__
  and __FUNCTION__
- exp_gre: expectations must now be allocated by the helper/caller; it's
  been this way for at least a year, this patch was probably never
  tested
- merge revision 1.1
date: 2005/01/10 18:29:17;  author: mlhuang;  state: Exp;
patch-o-matic-ng-20050103 pptp-conntrack-nat
---