Linus Torvalds a44f99c7ef Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits)
  video: change to new flag variable
  scsi: change to new flag variable
  rtc: change to new flag variable
  rapidio: change to new flag variable
  pps: change to new flag variable
  net: change to new flag variable
  misc: change to new flag variable
  message: change to new flag variable
  memstick: change to new flag variable
  isdn: change to new flag variable
  ieee802154: change to new flag variable
  ide: change to new flag variable
  hwmon: change to new flag variable
  dma: change to new flag variable
  char: change to new flag variable
  fs: change to new flag variable
  xtensa: change to new flag variable
  um: change to new flag variables
  s390: change to new flag variable
  mips: change to new flag variable
  ...

Fix up trivial conflict in drivers/hwmon/Makefile
2011-03-20 18:14:55 -07:00
..
2010-08-09 16:47:37 -04:00
2010-08-09 16:48:17 -04:00
2006-10-02 09:55:27 -05:00
2008-05-13 08:22:10 -05:00
2010-04-23 02:08:44 +02:00
2008-06-10 15:12:58 -05:00
2006-10-02 09:55:27 -05:00
2009-06-24 08:17:04 -04:00
2010-08-09 16:48:17 -04:00
2007-04-26 07:30:29 -05:00
2006-10-02 09:55:27 -05:00
2010-08-09 11:25:17 +02:00
2006-10-02 09:55:27 -05:00
2010-10-25 21:26:11 -04:00
2009-01-09 15:42:04 -06:00
2006-10-02 09:55:27 -05:00
2006-10-02 09:55:27 -05:00
2009-01-09 15:42:04 -06:00
2009-02-02 13:43:28 -06:00
2011-03-17 14:02:57 +01:00
2010-04-16 08:05:50 -05:00