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-12-22 18:57:02 +01:00
2010-08-09 16:48:42 -04:00
2010-07-14 11:29:46 +02:00
2011-03-14 09:15:23 -04:00
2010-10-30 01:42:19 -04:00
2010-10-30 08:45:43 -04:00
2011-02-16 13:30:48 +01:00
2010-12-16 11:36:43 +01:00
2010-11-01 15:38:34 -04:00
2010-10-01 10:50:58 -07:00
2010-11-18 13:27:46 +01:00
2011-01-26 12:33:22 +01:00
2011-01-26 12:33:22 +01:00
2011-03-15 02:21:44 -04:00
2010-12-29 11:31:38 -08:00